From 26bddd41aa2212fcc21cc7a43e271da910b57ef8 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 22 Nov 2005 01:48:43 +0000 Subject: [PATCH] Enable MKISS globally (closes: #340215) svn path=/dists/trunk/linux-2.6/; revision=4866 --- debian/arch/alpha/config.alpha-generic | 1 - debian/arch/alpha/config.alpha-smp | 1 - debian/arch/amd64/config.amd64-generic | 1 - debian/arch/amd64/config.amd64-k8 | 1 - debian/arch/amd64/config.amd64-k8-smp | 1 - debian/arch/amd64/config.em64t-p4 | 1 - debian/arch/amd64/config.em64t-p4-smp | 1 - debian/arch/config | 1 + debian/arch/i386/config.386 | 1 - debian/arch/i386/config.686 | 1 - debian/arch/i386/config.686-smp | 1 - debian/arch/i386/config.k7 | 1 - debian/arch/i386/config.k7-smp | 1 - debian/arch/ia64/config | 1 - debian/arch/powerpc/config | 1 - debian/changelog | 5 ++++- 16 files changed, 5 insertions(+), 15 deletions(-) diff --git a/debian/arch/alpha/config.alpha-generic b/debian/arch/alpha/config.alpha-generic index a3123a461..bb3cc0a8d 100644 --- a/debian/arch/alpha/config.alpha-generic +++ b/debian/arch/alpha/config.alpha-generic @@ -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 diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp index a15441d68..fc46aade3 100644 --- a/debian/arch/alpha/config.alpha-smp +++ b/debian/arch/alpha/config.alpha-smp @@ -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 diff --git a/debian/arch/amd64/config.amd64-generic b/debian/arch/amd64/config.amd64-generic index 7102f04e8..30cb1900c 100644 --- a/debian/arch/amd64/config.amd64-generic +++ b/debian/arch/amd64/config.amd64-generic @@ -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 diff --git a/debian/arch/amd64/config.amd64-k8 b/debian/arch/amd64/config.amd64-k8 index 41a7c62cd..61c231854 100644 --- a/debian/arch/amd64/config.amd64-k8 +++ b/debian/arch/amd64/config.amd64-k8 @@ -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 diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp index fc169bd5e..ba10b9a8f 100644 --- a/debian/arch/amd64/config.amd64-k8-smp +++ b/debian/arch/amd64/config.amd64-k8-smp @@ -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 diff --git a/debian/arch/amd64/config.em64t-p4 b/debian/arch/amd64/config.em64t-p4 index 7ade247f9..bf868a27c 100644 --- a/debian/arch/amd64/config.em64t-p4 +++ b/debian/arch/amd64/config.em64t-p4 @@ -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 diff --git a/debian/arch/amd64/config.em64t-p4-smp b/debian/arch/amd64/config.em64t-p4-smp index 03965f744..9c327e952 100644 --- a/debian/arch/amd64/config.em64t-p4-smp +++ b/debian/arch/amd64/config.em64t-p4-smp @@ -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 diff --git a/debian/arch/config b/debian/arch/config index 58972db8b..ca4273c99 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -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 diff --git a/debian/arch/i386/config.386 b/debian/arch/i386/config.386 index a9aa01913..6c607e70f 100644 --- a/debian/arch/i386/config.386 +++ b/debian/arch/i386/config.386 @@ -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 diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686 index 18b0cde76..5587a839d 100644 --- a/debian/arch/i386/config.686 +++ b/debian/arch/i386/config.686 @@ -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 diff --git a/debian/arch/i386/config.686-smp b/debian/arch/i386/config.686-smp index fb39c3f83..7116f8ce0 100644 --- a/debian/arch/i386/config.686-smp +++ b/debian/arch/i386/config.686-smp @@ -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 diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7 index e99aeb3d1..04a6fc066 100644 --- a/debian/arch/i386/config.k7 +++ b/debian/arch/i386/config.k7 @@ -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 diff --git a/debian/arch/i386/config.k7-smp b/debian/arch/i386/config.k7-smp index 507f13cc2..967fce5cd 100644 --- a/debian/arch/i386/config.k7-smp +++ b/debian/arch/i386/config.k7-smp @@ -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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 24c32ef7e..907ff6463 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index bde8ddd2a..4d8ce4a93 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -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 diff --git a/debian/changelog b/debian/changelog index abc3c6ea2..95967d546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 20 Nov 2005 15:05:12 +0100 + [ Simon Horman ] + * Enable MKISS globally (closes: #340215) + + -- Simon Horman Tue, 22 Nov 2005 10:46:21 +0900 linux-2.6 (2.6.14-3) unstable; urgency=low