Enable MKISS globally (closes: #340215)

svn path=/dists/trunk/linux-2.6/; revision=4866
This commit is contained in:
Simon Horman 2005-11-22 01:48:43 +00:00
parent 533df5ae83
commit 26bddd41aa
16 changed files with 5 additions and 15 deletions

View File

@ -4,7 +4,6 @@ CONFIG_MTD_XIP=y
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
CONFIG_DONGLE_OLD=y

View File

@ -6,5 +6,4 @@ CONFIG_HAVE_DEC_LOCK=y
CONFIG_NR_CPUS=64
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_MATHEMU=y
CONFIG_MKISS=m
# CONFIG_DIGIEPCA is not set

View File

@ -8,7 +8,6 @@ CONFIG_X86_L1_CACHE_SHIFT=7
# CONFIG_NUMA is not set
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_MTD_XIP is not set
CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m

View File

@ -8,7 +8,6 @@ CONFIG_X86_L1_CACHE_SHIFT=6
# CONFIG_NUMA is not set
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_MTD_XIP is not set
CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m

View File

@ -24,7 +24,6 @@ CONFIG_NEED_MULTIPLE_NODES=y
# CONFIG_HOTPLUG_CPU is not set
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_DIGIEPCA=m
CONFIG_MKISS=m
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

View File

@ -8,7 +8,6 @@ CONFIG_X86_L1_CACHE_SHIFT=7
# CONFIG_NUMA is not set
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_MTD_XIP is not set
CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m

View File

@ -23,7 +23,6 @@ CONFIG_FS_MBCACHE=m
CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_HOTPLUG_CPU is not set
CONFIG_DIGIEPCA=m
CONFIG_MKISS=m
CONFIG_FLATMEM_MANUAL=y
# CONFIG_SPARSEMEM_MANUAL is not set
# CONFIG_DISCONTIGMEM_MANUAL is not set

1
debian/arch/config vendored
View File

@ -736,3 +736,4 @@ CONFIG_USB_SERIAL_ANYDATA=m
CONFIG_VIDEO_DECODER=m
CONFIG_VIDEO_AUDIO_DECODER=m
CONFIG_CARDMAN_4040=m
CONFIG_MKISS=m

View File

@ -43,7 +43,6 @@ CONFIG_53C700_IO_MAPPED=y
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set

View File

@ -34,7 +34,6 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set

View File

@ -38,7 +38,6 @@ CONFIG_HAVE_DEC_LOCK=y
# CONFIG_SBPCD is not set
# CONFIG_CM206 is not set
# CONFIG_CDU31A is not set
# CONFIG_MKISS is not set
# CONFIG_DMASCC is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_NI5010 is not set

View File

@ -35,7 +35,6 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set

View File

@ -39,7 +39,6 @@ CONFIG_HAVE_DEC_LOCK=y
# CONFIG_SBPCD is not set
# CONFIG_CM206 is not set
# CONFIG_CDU31A is not set
# CONFIG_MKISS is not set
# CONFIG_DMASCC is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_NI5010 is not set

View File

@ -1366,6 +1366,5 @@ CONFIG_IA64_PRINT_HAZARDS=y
# CONFIG_IA64_DEBUG_IRQ is not set
CONFIG_SYSVIPC_COMPAT=y
# CONFIG_PM_DEBUG is not set
CONFIG_MKISS=m
CONFIG_DIGIEPCA=m
# CONFIG_CPU_FREQ is not set

View File

@ -1253,5 +1253,4 @@ CONFIG_SOFTWARE_SUSPEND=y
CONFIG_PM_STD_PARTITION=""
CONFIG_HOTPLUG=y
# CONFIG_HOTPLUG_CPU is not set
CONFIG_MKISS=m
CONFIG_I2C_PMAC_SMU=m

5
debian/changelog vendored
View File

@ -4,7 +4,10 @@ linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low
* New upstream release candidate.
* Readdition of qla2xxx drivers, as firmware license has been fixed.
-- Frederik Schüler <fs@debian.org> Sun, 20 Nov 2005 15:05:12 +0100
[ Simon Horman ]
* Enable MKISS globally (closes: #340215)
-- Simon Horman <horms@debian.org> Tue, 22 Nov 2005 10:46:21 +0900
linux-2.6 (2.6.14-3) unstable; urgency=low