bk://linux-sam.bkbits.net/kconfig sam@mars.ravnborg.org|ChangeSet|20050130212046|41703 sam # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/02/02 22:08:08-08:00 akpm@bix.(none) # Merge bk://linux-sam.bkbits.net/kconfig # into bix.(none):/usr/src/bk-kconfig # # sound/oss/Kconfig # 2005/02/02 22:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/Kconfig # 2005/02/02 22:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pcmcia/Kconfig # 2005/02/02 22:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/02/02 22:06:17-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/02/02 22:06:13-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/asm-x86_64/page.h # 2005/02/02 22:06:13-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/30 22:20:46+01:00 sam@mars.ravnborg.org # kconfig: Define own icons for tree structure # # Define own icons for tree structure, allowing icons to match other icons. # This also makes gconfig independent on icons defined for xconfig. # # Signed-off-by: Sam Ravnborg # # scripts/kconfig/gconf.c # 2005/01/30 22:20:26+01:00 sam@mars.ravnborg.org +33 -1 # Define own icons for tree structure # # ChangeSet # 2005/01/30 22:06:13+01:00 zippel@linux-m68k.org # Kconfig: cleanup USB menu # # This properly indents the USB menu. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/usb/storage/Kconfig # 2005/01/29 22:56:59+01:00 zippel@linux-m68k.org +1 -0 # Kconfig: cleanup USB menu # # drivers/usb/host/Kconfig # 2005/01/29 22:56:59+01:00 zippel@linux-m68k.org +0 -18 # Kconfig: cleanup USB menu # # drivers/usb/Kconfig # 2005/01/29 22:56:59+01:00 zippel@linux-m68k.org +18 -0 # Kconfig: cleanup USB menu # # ChangeSet # 2005/01/30 22:05:47+01:00 zippel@linux-m68k.org # Kconfig: cleanup sound menu # # This properly indents the sound menu. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # sound/oss/Kconfig # 2005/01/29 22:56:51+01:00 zippel@linux-m68k.org +4 -4 # Kconfig: cleanup sound menu # # sound/core/Kconfig # 2005/01/29 22:56:51+01:00 zippel@linux-m68k.org +6 -1 # Kconfig: cleanup sound menu # # ChangeSet # 2005/01/30 22:04:57+01:00 zippel@linux-m68k.org # Kconfig: cleanup input menu # # A rather complete cleanup of the input menu. # # From: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/input/touchscreen/Kconfig # 2005/01/30 16:34:23+01:00 zippel@linux-m68k.org +5 -4 # Kconfig: cleanup input menu # # drivers/input/serio/Kconfig # 2005/01/30 16:29:01+01:00 zippel@linux-m68k.org +14 -15 # Kconfig: cleanup input menu # # drivers/input/mouse/Kconfig # 2005/01/30 16:33:49+01:00 zippel@linux-m68k.org +11 -12 # Kconfig: cleanup input menu # # drivers/input/misc/Kconfig # 2005/01/30 16:34:48+01:00 zippel@linux-m68k.org +8 -7 # Kconfig: cleanup input menu # # drivers/input/keyboard/Kconfig # 2005/01/30 16:33:35+01:00 zippel@linux-m68k.org +7 -9 # Kconfig: cleanup input menu # # drivers/input/joystick/Kconfig # 2005/01/30 16:34:09+01:00 zippel@linux-m68k.org +20 -24 # Kconfig: cleanup input menu # # drivers/input/gameport/Kconfig # 2005/01/30 16:27:27+01:00 zippel@linux-m68k.org +22 -26 # Kconfig: cleanup input menu # # drivers/input/Kconfig # 2005/01/30 16:14:56+01:00 zippel@linux-m68k.org +13 -12 # Kconfig: cleanup input menu # # ChangeSet # 2005/01/30 22:00:48+01:00 zippel@linux-m68k.org # Kconfig: cleanup various driver menus # # This properly indents various driver menus. # Remove PARPORT_PC_CML1. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/video/Kconfig # 2005/01/29 22:55:32+01:00 zippel@linux-m68k.org +14 -15 # Kconfig: cleanup various driver menus # # drivers/parport/Kconfig # 2005/01/29 22:55:32+01:00 zippel@linux-m68k.org +3 -9 # Kconfig: cleanup various driver menus # # drivers/mtd/Kconfig # 2005/01/29 22:55:32+01:00 zippel@linux-m68k.org +9 -9 # Kconfig: cleanup various driver menus # # ChangeSet # 2005/01/30 22:00:21+01:00 zippel@linux-m68k.org # Kconfig: cleanup kernel hacking menu # # This properly indents the kernel hacking menu. # Move LOG_BUF_SHIFT into kernel hacking menu (it already depended on DEBUG_KERNEL). # Add DEBUG_KERNEL dependency to EARLY_PRINTK, DEBUG_PREEMPT and FRAME_POINTER. # Remove overlong dependency, which included practically every arch. # Merge the two MAGIC_SYSRQ menu entries. # Remove unnecessary "default n" options. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # lib/Kconfig.debug # 2005/01/29 22:56:22+01:00 zippel@linux-m68k.org +30 -23 # Kconfig: cleanup kernel hacking menu # # init/Kconfig # 2005/01/29 22:56:22+01:00 zippel@linux-m68k.org +0 -20 # Kconfig: cleanup kernel hacking menu # # arch/i386/Kconfig.debug # 2005/01/29 22:56:22+01:00 zippel@linux-m68k.org +2 -1 # Kconfig: cleanup kernel hacking menu # # ChangeSet # 2005/01/30 21:59:54+01:00 zippel@linux-m68k.org # Kconfig: cleanup cpufreq menu # # This properly indents the cpufreq menu. # Remove CPU_FREQ_TABLE as visible option and use select instead. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/cpufreq/Kconfig # 2005/01/29 22:55:57+01:00 zippel@linux-m68k.org +10 -10 # Kconfig: cleanup cpufreq menu # # arch/i386/kernel/cpu/cpufreq/Kconfig # 2005/01/29 22:55:57+01:00 zippel@linux-m68k.org +24 -30 # Kconfig: cleanup cpufreq menu # # ChangeSet # 2005/01/30 21:59:27+01:00 zippel@linux-m68k.org # Kconfig: cleanup bus options menu # # This properly indents the bus options menu. # Merge the two MCA menu entries. # Remove unnecessary "default n" options. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/pcmcia/Kconfig # 2005/01/29 22:55:49+01:00 zippel@linux-m68k.org +6 -5 # Kconfig: cleanup bus options menu # # drivers/pci/pcie/Kconfig # 2005/01/29 22:55:49+01:00 zippel@linux-m68k.org +1 -1 # Kconfig: cleanup bus options menu # # drivers/pci/Kconfig # 2005/01/29 22:55:49+01:00 zippel@linux-m68k.org +1 -1 # Kconfig: cleanup bus options menu # # arch/i386/Kconfig # 2005/01/29 22:55:49+01:00 zippel@linux-m68k.org +2 -6 # Kconfig: cleanup bus options menu # # ChangeSet # 2005/01/30 21:58:59+01:00 zippel@linux-m68k.org # Kconfig: cleanup ACPI menu # # This properly indents the ACPI menu. # Hide ACPI_BLACKLIST_YEAR when not needed. # # Signed-off-by: Roman Zippel # Signed-off-by: Sam Ravnborg # # drivers/acpi/Kconfig # 2005/01/29 22:55:05+01:00 zippel@linux-m68k.org +13 -23 # Kconfig: cleanup ACPI menu # # ChangeSet # 2005/01/28 15:32:44-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/28 15:32:40-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/22 16:21:25-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/22 16:21:21-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/18 02:10:24-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # arch/x86_64/mm/init.c # 2005/01/18 02:10:19-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/15 21:04:19-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/15 21:04:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/15 21:04:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/asm-x86_64/page.h # 2005/01/15 21:04:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/mm/init.c # 2005/01/15 21:04:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 22:03:40-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/11 22:03:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/mm/init.c # 2005/01/11 22:03:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 12:19:40-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # include/linux/mm.h # 2005/01/11 12:19:36-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/10 15:14:25-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/10 15:14:22-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/08 21:56:20-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/08 21:56:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/08 21:56:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/05 18:37:31-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/05 18:37:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/05 18:37:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/05 15:19:08-08:00 akpm@bix.(none) # Merge bk://linux-sam.bkbits.net/kconfig # into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/05 15:19:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/05 15:19:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/asm-x86_64/page.h # 2005/01/05 15:19:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/mm/init.c # 2005/01/05 15:19:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/04 23:33:58-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/04 23:33:54-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/04 23:33:54-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/04 14:21:36-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/04 14:21:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/04 14:21:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/asm-x86_64/page.h # 2005/01/04 14:21:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/mm/init.c # 2005/01/04 14:21:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/04 00:33:25-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/04 00:33:20-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/04 00:33:20-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/02 19:04:19-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/02 19:04:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/02 16:32:54-08:00 akpm@bix.(none) # Merge bk://linux-sam.bkbits.net/kconfig # into bix.(none):/usr/src/bk-kconfig # # mm/memory.c # 2005/01/02 16:32:50-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/mm.h # 2005/01/02 16:32:50-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/asm-x86_64/page.h # 2005/01/02 16:32:50-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/x86_64/mm/init.c # 2005/01/02 16:32:50-08:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig --- a/arch/i386/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/arch/i386/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1164,17 +1164,13 @@ source "drivers/eisa/Kconfig" config MCA - bool "MCA support" - depends on !(X86_VISWS || X86_VOYAGER) + bool "MCA support" if !(X86_VISWS || X86_VOYAGER) + default y if X86_VOYAGER help MicroChannel Architecture is found in some IBM PS/2 machines and laptops. It is a bus system similar to PCI or ISA. See (and especially the web page given there) before attempting to build an MCA bus kernel. - -config MCA - depends on X86_VOYAGER - default y if X86_VOYAGER source "drivers/mca/Kconfig" diff -Nru a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug --- a/arch/i386/Kconfig.debug 2005-02-03 19:00:10 -08:00 +++ b/arch/i386/Kconfig.debug 2005-02-03 19:00:10 -08:00 @@ -3,7 +3,7 @@ source "lib/Kconfig.debug" config EARLY_PRINTK - bool "Early printk" if EMBEDDED + bool "Early printk" if EMBEDDED && DEBUG_KERNEL default y help Write kernel log output directly into the VGA buffer or to a serial @@ -48,6 +48,7 @@ config 4KSTACKS bool "Use 4Kb for kernel stacks instead of 8Kb" + depends on DEBUG_KERNEL help If you say Y here the kernel will use a 4Kb stacksize for the kernel stack attached to each process/thread. This facilitates diff -Nru a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig --- a/arch/i386/kernel/cpu/cpufreq/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/arch/i386/kernel/cpu/cpufreq/Kconfig 2005-02-03 19:00:10 -08:00 @@ -6,22 +6,14 @@ source "drivers/cpufreq/Kconfig" -config CPU_FREQ_TABLE - tristate "CPU frequency table helpers" - depends on CPU_FREQ - default y - help - Many CPUFreq drivers use these helpers, so only say N here if - the CPUFreq driver of your choice doesn't need these helpers. - - If in doubt, say Y. +if CPU_FREQ comment "CPUFreq processor drivers" - depends on CPU_FREQ config X86_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" - depends on CPU_FREQ_TABLE && ACPI_PROCESSOR + select CPU_FREQ_TABLE + depends on ACPI_PROCESSOR help This driver adds a CPUFreq driver which utilizes the ACPI Processor Performance States. @@ -32,7 +24,8 @@ config ELAN_CPUFREQ tristate "AMD Elan" - depends on CPU_FREQ_TABLE && X86_ELAN + select CPU_FREQ_TABLE + depends on X86_ELAN ---help--- This adds the CPUFreq driver for AMD Elan SC400 and SC410 processors. @@ -47,7 +40,7 @@ config X86_POWERNOW_K6 tristate "AMD Mobile K6-2/K6-3 PowerNow!" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE help This adds the CPUFreq driver for mobile AMD K6-2+ and mobile AMD K6-3+ processors. @@ -58,7 +51,7 @@ config X86_POWERNOW_K7 tristate "AMD Mobile Athlon/Duron PowerNow!" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE help This adds the CPUFreq driver for mobile AMD K7 mobile processors. @@ -68,12 +61,14 @@ config X86_POWERNOW_K7_ACPI bool - depends on ((X86_POWERNOW_K7 = "m" && ACPI_PROCESSOR) || (X86_POWERNOW_K7 = "y" && ACPI_PROCESSOR = "y")) + depends on X86_POWERNOW_K7 && ACPI_PROCESSOR + depends on !(X86_POWERNOW_K7 = y && ACPI_PROCESSOR = m) default y config X86_POWERNOW_K8 tristate "AMD Opteron/Athlon64 PowerNow!" - depends on CPU_FREQ_TABLE && EXPERIMENTAL + select CPU_FREQ_TABLE + depends on EXPERIMENTAL help This adds the CPUFreq driver for mobile AMD Opteron/Athlon64 processors. @@ -83,12 +78,12 @@ config X86_POWERNOW_K8_ACPI bool - depends on ((X86_POWERNOW_K8 = "m" && ACPI_PROCESSOR) || (X86_POWERNOW_K8 = "y" && ACPI_PROCESSOR = "y")) + depends on X86_POWERNOW_K8 && ACPI_PROCESSOR + depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m) default y config X86_GX_SUSPMOD tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation" - depends on CPU_FREQ help This add the CPUFreq driver for NatSemi Geode processors which support suspend modulation. @@ -99,7 +94,7 @@ config X86_SPEEDSTEP_CENTRINO tristate "Intel Enhanced SpeedStep" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI) help This adds the CPUFreq driver for Enhanced SpeedStep enabled @@ -114,8 +109,8 @@ config X86_SPEEDSTEP_CENTRINO_ACPI bool "Use ACPI tables to decode valid frequency/voltage pairs" - depends on X86_SPEEDSTEP_CENTRINO - depends on ((X86_SPEEDSTEP_CENTRINO = "m" && ACPI_PROCESSOR) || (X86_SPEEDSTEP_CENTRINO = "y" && ACPI_PROCESSOR = "y")) + depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR + depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m) default y help Use primarily the information provided in the BIOS ACPI tables @@ -136,7 +131,7 @@ config X86_SPEEDSTEP_ICH tristate "Intel Speedstep on ICH-M chipsets (ioport interface)" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE help This adds the CPUFreq driver for certain mobile Intel Pentium III (Coppermine), all mobile Intel Pentium III-M (Tualatin) and all @@ -149,7 +144,8 @@ config X86_SPEEDSTEP_SMI tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)" - depends on CPU_FREQ_TABLE && EXPERIMENTAL + select CPU_FREQ_TABLE + depends on EXPERIMENTAL help This adds the CPUFreq driver for certain mobile Intel Pentium III (Coppermine), all mobile Intel Pentium III-M (Tualatin) @@ -161,7 +157,7 @@ config X86_P4_CLOCKMOD tristate "Intel Pentium 4 clock modulation" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE help This adds the CPUFreq driver for Intel Pentium 4 / XEON processors. @@ -172,7 +168,7 @@ config X86_CPUFREQ_NFORCE2 tristate "nVidia nForce2 FSB changing" - depends on CPU_FREQ && EXPERIMENTAL + depends on EXPERIMENTAL help This adds the CPUFreq driver for FSB changing on nVidia nForce2 platforms. @@ -183,7 +179,6 @@ config X86_LONGRUN tristate "Transmeta LongRun" - depends on CPU_FREQ help This adds the CPUFreq driver for Transmeta Crusoe and Efficeon processors which support LongRun. @@ -194,7 +189,7 @@ config X86_LONGHAUL tristate "VIA Cyrix III Longhaul" - depends on CPU_FREQ_TABLE + select CPU_FREQ_TABLE help This adds the CPUFreq driver for VIA Samuel/CyrixIII, VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T @@ -205,7 +200,6 @@ If in doubt, say N. comment "shared options" - depends on CPU_FREQ config X86_ACPI_CPUFREQ_PROC_INTF bool "/proc/acpi/processor/../performance interface (deprecated)" @@ -220,8 +214,7 @@ config X86_SPEEDSTEP_LIB tristate - depends on (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) - default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) + default X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD config X86_SPEEDSTEP_RELAXED_CAP_CHECK bool "Relaxed speedstep capability checks" @@ -233,5 +226,6 @@ option lets the probing code bypass some of those checks if the parameter "relaxed_check=1" is passed to the module. +endif # CPU_FREQ endmenu diff -Nru a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig --- a/drivers/acpi/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/acpi/Kconfig 2005-02-03 19:00:10 -08:00 @@ -40,21 +40,23 @@ available at: +if ACPI + config ACPI_BOOT bool - depends on ACPI || X86_HT + depends on X86_HT default y config ACPI_INTERPRETER bool - depends on ACPI depends on !IA64_SGI_SN default y +if ACPI_INTERPRETER + config ACPI_SLEEP bool "Sleep States (EXPERIMENTAL)" - depends on X86 && ACPI - depends on ACPI_INTERPRETER + depends on X86 depends on EXPERIMENTAL && PM default y ---help--- @@ -81,7 +83,6 @@ config ACPI_AC tristate "AC Adapter" depends on X86 - depends on ACPI_INTERPRETER default m help This driver adds support for the AC Adapter object, which indicates @@ -91,7 +92,6 @@ config ACPI_BATTERY tristate "Battery" depends on X86 - depends on ACPI_INTERPRETER default m help This driver adds support for battery information through @@ -100,7 +100,6 @@ config ACPI_BUTTON tristate "Button" - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default m help @@ -112,7 +111,6 @@ config ACPI_VIDEO tristate "Video" - depends on ACPI_INTERPRETER depends on EXPERIMENTAL depends on !IA64_SGI_SN default m @@ -127,7 +125,6 @@ config ACPI_FAN tristate "Fan" - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default m help @@ -136,7 +133,6 @@ config ACPI_PROCESSOR tristate "Processor" - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default m help @@ -165,7 +161,6 @@ config ACPI_NUMA bool "NUMA support" - depends on ACPI_INTERPRETER depends on NUMA depends on (IA64 || X86_64) default y if IA64_GENERIC || IA64_SGI_SN2 @@ -173,7 +168,6 @@ config ACPI_ASUS tristate "ASUS/Medion Laptop Extras" depends on X86 - depends on ACPI_INTERPRETER default m ---help--- This driver provides support for extra features of ACPI-compatible @@ -203,7 +197,6 @@ config ACPI_IBM tristate "IBM ThinkPad Laptop Extras" depends on X86 - depends on ACPI_INTERPRETER default m ---help--- This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds @@ -217,7 +210,6 @@ config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" depends on X86 - depends on ACPI_INTERPRETER default m ---help--- This driver adds support for access to certain system settings @@ -244,7 +236,7 @@ config ACPI_CUSTOM_DSDT bool "Include Custom DSDT" - depends on ACPI_INTERPRETER && !STANDALONE + depends on !STANDALONE default n help Thist option is to load a custom ACPI DSDT @@ -270,7 +262,6 @@ config ACPI_DEBUG bool "Debug Statements" - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default n help @@ -280,14 +271,12 @@ config ACPI_BUS bool - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default y config ACPI_EC bool depends on X86 - depends on ACPI_INTERPRETER default y help This driver is required on some systems for the proper operation of @@ -296,28 +285,27 @@ config ACPI_POWER bool - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default y config ACPI_PCI bool - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default PCI config ACPI_SYSTEM bool - depends on ACPI_INTERPRETER depends on !IA64_SGI_SN default y help This driver will enable your system to shut down using ACPI, and dump your ACPI DSDT table using /proc/acpi/dsdt. +endif # ACPI_INTERPRETER + config X86_PM_TIMER bool "Power Management Timer Support" - depends on X86 && ACPI + depends on X86 depends on ACPI_BOOT && EXPERIMENTAL depends on !X86_64 default n @@ -336,10 +324,12 @@ config ACPI_CONTAINER tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)" - depends on ACPI && EXPERIMENTAL + depends on EXPERIMENTAL default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) ---help--- This is the ACPI generic container driver which supports ACPI0004, PNP0A05 and PNP0A06 devices + +endif # ACPI endmenu diff -Nru a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig --- a/drivers/cpufreq/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/cpufreq/Kconfig 2005-02-03 19:00:10 -08:00 @@ -13,9 +13,13 @@ If in doubt, say N. +if CPU_FREQ + +config CPU_FREQ_TABLE + def_tristate m + config CPU_FREQ_DEBUG bool "Enable CPUfreq debugging" - depends on CPU_FREQ help Say Y here to enable CPUfreq subsystem (including drivers) debugging. You will need to activate it via the kernel @@ -29,7 +33,7 @@ config CPU_FREQ_STAT tristate "CPU frequency translation statistics" - depends on CPU_FREQ && CPU_FREQ_TABLE + select CPU_FREQ_TABLE default y help This driver exports CPU frequency statistics information through sysfs @@ -37,17 +41,15 @@ config CPU_FREQ_STAT_DETAILS bool "CPU frequency translation statistics details" - depends on CPU_FREQ && CPU_FREQ_STAT - default n + depends on CPU_FREQ_STAT help This will show detail CPU frequency translation table in sysfs file system choice prompt "Default CPUFreq governor" - depends on CPU_FREQ - default CPU_FREQ_DEFAULT_GOV_PERFORMANCE if !CPU_FREQ_SA1100 && !CPU_FREQ_SA1110 default CPU_FREQ_DEFAULT_GOV_USERSPACE if CPU_FREQ_SA1100 || CPU_FREQ_SA1110 + default CPU_FREQ_DEFAULT_GOV_PERFORMANCE help This option sets which CPUFreq governor shall be loaded at startup. If in doubt, select 'performance'. @@ -73,7 +75,6 @@ config CPU_FREQ_GOV_PERFORMANCE tristate "'performance' governor" - depends on CPU_FREQ help This cpufreq governor sets the frequency statically to the highest available CPU frequency. @@ -82,7 +83,6 @@ config CPU_FREQ_GOV_POWERSAVE tristate "'powersave' governor" - depends on CPU_FREQ help This cpufreq governor sets the frequency statically to the lowest available CPU frequency. @@ -91,7 +91,6 @@ config CPU_FREQ_GOV_USERSPACE tristate "'userspace' governor for userspace frequency scaling" - depends on CPU_FREQ help Enable this cpufreq governor when you either want to set the CPU frequency manually or when an userspace program shall @@ -104,7 +103,6 @@ config CPU_FREQ_GOV_ONDEMAND tristate "'ondemand' cpufreq policy governor" - depends on CPU_FREQ help 'ondemand' - This driver adds a dynamic cpufreq policy governor. The governor does a periodic polling and @@ -116,3 +114,5 @@ For details, take a look at linux/Documentation/cpu-freq. If in doubt, say N. + +endif # CPU_FREQ diff -Nru a/drivers/input/Kconfig b/drivers/input/Kconfig --- a/drivers/input/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/Kconfig 2005-02-03 19:00:10 -08:00 @@ -5,7 +5,7 @@ menu "Input device support" config INPUT - tristate "Input devices (needed for keyboard, mouse, ...)" if EMBEDDED + tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED default y ---help--- Say Y here if you have any input device (mouse, keyboard, tablet, @@ -22,12 +22,13 @@ To compile this driver as a module, choose M here: the module will be called input. +if INPUT + comment "Userland interfaces" config INPUT_MOUSEDEV tristate "Mouse interface" if EMBEDDED default y - depends on INPUT ---help--- Say Y here if you want your mouse to be accessible as char devices 13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an @@ -74,7 +75,6 @@ config INPUT_JOYDEV tristate "Joystick interface" - depends on INPUT ---help--- Say Y here if you want your joystick or gamepad to be accessible as char device 13:0+ - /dev/input/jsX device. @@ -88,7 +88,6 @@ config INPUT_TSDEV tristate "Touchscreen interface" - depends on INPUT ---help--- Say Y here if you have an application that only can understand the Compaq touchscreen protocol for absolute pointer data. This is @@ -111,7 +110,6 @@ config INPUT_EVDEV tristate "Event interface" - depends on INPUT help Say Y here if you want your input device events be accessible under char device 13:64+ - /dev/input/eventX in a generic way. @@ -121,7 +119,6 @@ config INPUT_EVBUG tristate "Event debugging" - depends on INPUT ---help--- Say Y here if you have a problem with the input subsystem and want all events (keypresses, mouse movements), to be output to @@ -134,12 +131,6 @@ To compile this driver as a module, choose M here: the module will be called evbug. -comment "Input I/O drivers" - -source "drivers/input/gameport/Kconfig" - -source "drivers/input/serio/Kconfig" - comment "Input Device Drivers" source "drivers/input/keyboard/Kconfig" @@ -151,6 +142,16 @@ source "drivers/input/touchscreen/Kconfig" source "drivers/input/misc/Kconfig" + +endif + +menu "Hardware I/O ports" + +source "drivers/input/serio/Kconfig" + +source "drivers/input/gameport/Kconfig" + +endmenu endmenu diff -Nru a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig --- a/drivers/input/gameport/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/gameport/Kconfig 2005-02-03 19:00:10 -08:00 @@ -19,30 +19,10 @@ To compile this driver as a module, choose M here: the module will be called gameport. - -# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on -# in every .config. Please don't touch it. It is here to handle an -# unusual dependency between GAMEPORT and sound drivers. -# -# Some sound drivers call gameport functions. If GAMEPORT is -# not selected, empty stubs are provided for the functions and all is -# well. -# If GAMEPORT is built in, everything is fine. -# If GAMEPORT is a module, however, it would need to be loaded for the -# sound driver to be able to link properly. Therefore, the sound -# driver must be a module as well in that case. Since there's no way -# to express that directly in Kconfig, we use SOUND_GAMEPORT to -# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm', -# anything that depends on SOUND_GAMEPORT must be 'm' as well. if -# GAMEPORT is 'y' or 'n', it can be anything". -config SOUND_GAMEPORT - tristate - default y if GAMEPORT!=m - default m if GAMEPORT=m +if GAMEPORT config GAMEPORT_NS558 tristate "Classic ISA and PnP gameport support" - depends on GAMEPORT help Say Y here if you have an ISA or PnP gameport. @@ -53,7 +33,6 @@ config GAMEPORT_L4 tristate "PDPI Lightning 4 gamecard support" - depends on GAMEPORT help Say Y here if you have a PDPI Lightning 4 gamecard. @@ -62,7 +41,6 @@ config GAMEPORT_EMU10K1 tristate "SB Live and Audigy gameport support" - depends on GAMEPORT help Say Y here if you have a SoundBlaster Live! or SoundBlaster Audigy card and want to use its gameport. @@ -72,7 +50,6 @@ config GAMEPORT_VORTEX tristate "Aureal Vortex, Vortex 2 gameport support" - depends on GAMEPORT help Say Y here if you have an Aureal Vortex 1 or 2 card and want to use its gameport. @@ -82,9 +59,28 @@ config GAMEPORT_FM801 tristate "ForteMedia FM801 gameport support" - depends on GAMEPORT config GAMEPORT_CS461X tristate "Crystal SoundFusion gameport support" - depends on GAMEPORT +endif + +# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on +# in every .config. Please don't touch it. It is here to handle an +# unusual dependency between GAMEPORT and sound drivers. +# +# Some sound drivers call gameport functions. If GAMEPORT is +# not selected, empty stubs are provided for the functions and all is +# well. +# If GAMEPORT is built in, everything is fine. +# If GAMEPORT is a module, however, it would need to be loaded for the +# sound driver to be able to link properly. Therefore, the sound +# driver must be a module as well in that case. Since there's no way +# to express that directly in Kconfig, we use SOUND_GAMEPORT to +# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm', +# anything that depends on SOUND_GAMEPORT must be 'm' as well. if +# GAMEPORT is 'y' or 'n', it can be anything". +config SOUND_GAMEPORT + tristate + default m if GAMEPORT=m + default y diff -Nru a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig --- a/drivers/input/joystick/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/joystick/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,9 +1,8 @@ # # Joystick driver configuration # -config INPUT_JOYSTICK +menuconfig INPUT_JOYSTICK bool "Joysticks" - depends on INPUT help If you have a joystick, 6dof controller, gamepad, steering wheel, weapon control system or something like that you can say Y here @@ -13,9 +12,11 @@ Please read the file which contains more information. +if INPUT_JOYSTICK + config JOYSTICK_ANALOG tristate "Classic PC analog joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT ---help--- Say Y here if you have a joystick that connects to the PC gameport. In addition to the usual PC analog joystick, this driver @@ -32,7 +33,7 @@ config JOYSTICK_A3D tristate "Assasin 3D and MadCatz Panther devices" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have an FPGaming or MadCatz controller using the A3D protocol over the PC gameport. @@ -42,7 +43,7 @@ config JOYSTICK_ADI tristate "Logitech ADI digital joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Logitech controller using the ADI protocol over the PC gameport. @@ -52,7 +53,7 @@ config JOYSTICK_COBRA tristate "Creative Labs Blaster Cobra gamepad" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Creative Labs Blaster Cobra gamepad. @@ -61,7 +62,7 @@ config JOYSTICK_GF2K tristate "Genius Flight2000 Digital joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Genius Flight2000 or MaxFighter digitally communicating joystick or gamepad. @@ -71,7 +72,7 @@ config JOYSTICK_GRIP tristate "Gravis GrIP joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Gravis controller using the GrIP protocol over the PC gameport. @@ -81,7 +82,7 @@ config JOYSTICK_GRIP_MP tristate "Gravis GrIP MultiPort" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have the original Gravis GrIP MultiPort, a hub that connects to the gameport and you connect gamepads to it. @@ -91,7 +92,7 @@ config JOYSTICK_GUILLEMOT tristate "Guillemot joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Guillemot joystick using a digital protocol over the PC gameport. @@ -101,7 +102,7 @@ config JOYSTICK_INTERACT tristate "InterAct digital joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have an InterAct gameport or joystick communicating digitally over the gameport. @@ -111,7 +112,7 @@ config JOYSTICK_SIDEWINDER tristate "Microsoft SideWinder digital joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a Microsoft controller using the Digital Overdrive protocol over PC gameport. @@ -121,7 +122,7 @@ config JOYSTICK_TMDC tristate "ThrustMaster DirectConnect joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you have a ThrustMaster controller using the DirectConnect (BSP) protocol over the PC gameport. @@ -133,7 +134,6 @@ config JOYSTICK_WARRIOR tristate "Logitech WingMan Warrior joystick" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a Logitech WingMan Warrior joystick connected @@ -144,7 +144,6 @@ config JOYSTICK_MAGELLAN tristate "LogiCad3d Magellan/SpaceMouse 6dof controllers" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a Magellan or Space Mouse 6DOF controller @@ -155,7 +154,6 @@ config JOYSTICK_SPACEORB tristate "SpaceTec SpaceOrb/Avenger 6dof controllers" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF @@ -166,7 +164,6 @@ config JOYSTICK_SPACEBALL tristate "SpaceTec SpaceBall 6dof controllers" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a SpaceTec SpaceBall 2003/3003/4000 FLX @@ -178,7 +175,6 @@ config JOYSTICK_STINGER tristate "Gravis Stinger gamepad" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a Gravis Stinger connected to one of your @@ -189,7 +185,6 @@ config JOYSTICK_TWIDDLER tristate "Twiddler as a joystick" - depends on INPUT && INPUT_JOYSTICK select SERIO help Say Y here if you have a Handykey Twiddler connected to your @@ -200,7 +195,7 @@ config JOYSTICK_DB9 tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && PARPORT + depends on PARPORT ---help--- Say Y here if you have a Sega Master System gamepad, Sega Genesis gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga, @@ -213,7 +208,7 @@ config JOYSTICK_GAMECON tristate "Multisystem, NES, SNES, N64, PSX joysticks and gamepads" - depends on INPUT && INPUT_JOYSTICK && PARPORT + depends on PARPORT ---help--- Say Y here if you have a Nintendo Entertainment System gamepad, Super Nintendo Entertainment System gamepad, Nintendo 64 gamepad, @@ -227,7 +222,7 @@ config JOYSTICK_TURBOGRAFX tristate "Multisystem joysticks via TurboGraFX device" - depends on INPUT && INPUT_JOYSTICK && PARPORT + depends on PARPORT help Say Y here if you have the TurboGraFX interface by Steffen Schwenke, and want to use it with Multisystem -- Atari, Amiga, Commodore, @@ -239,7 +234,7 @@ config JOYSTICK_AMIGA tristate "Amiga joysticks" - depends on AMIGA && INPUT && INPUT_JOYSTICK + depends on AMIGA help Say Y here if you have an Amiga with a digital joystick connected to it. @@ -249,7 +244,7 @@ config JOYSTICK_JOYDUMP tristate "Gameport data dumper" - depends on INPUT && INPUT_JOYSTICK && GAMEPORT + select GAMEPORT help Say Y here if you want to dump data from your joystick into the system log for debugging purposes. Say N if you are making a production @@ -258,3 +253,4 @@ To compile this driver as a module, choose M here: the module will be called joydump. +endif diff -Nru a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig --- a/drivers/input/keyboard/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/keyboard/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,20 +1,20 @@ # # Input core configuration # -config INPUT_KEYBOARD +menuconfig INPUT_KEYBOARD bool "Keyboards" if EMBEDDED || !X86 default y - depends on INPUT help Say Y here, and a list of supported keyboards will be displayed. This option doesn't affect the kernel. If unsure, say Y. +if INPUT_KEYBOARD + config KEYBOARD_ATKBD tristate "AT keyboard support" if !PC default y - depends on INPUT && INPUT_KEYBOARD select SERIO select SERIO_LIBPS2 select SERIO_I8042 if PC @@ -32,7 +32,6 @@ config KEYBOARD_SUNKBD tristate "Sun Type 4 and Type 5 keyboard support" - depends on INPUT && INPUT_KEYBOARD select SERIO help Say Y here if you want to use a Sun Type 4 or Type 5 keyboard, @@ -44,7 +43,6 @@ config KEYBOARD_LKKBD tristate "DECstation/VAXstation LK201/LK401 keyboard support" - depends on INPUT && INPUT_KEYBOARD select SERIO help Say Y here if you want to use a LK201 or LK401 style serial @@ -57,7 +55,6 @@ config KEYBOARD_XTKBD tristate "XT Keyboard support" - depends on INPUT && INPUT_KEYBOARD select SERIO help Say Y here if you want to use the old IBM PC/XT keyboard (or @@ -70,7 +67,6 @@ config KEYBOARD_NEWTON tristate "Newton keyboard" - depends on INPUT && INPUT_KEYBOARD select SERIO help Say Y here if you have a Newton keyboard on a serial port. @@ -80,7 +76,7 @@ config KEYBOARD_MAPLE tristate "Maple bus keyboard support" - depends on SH_DREAMCAST && INPUT && INPUT_KEYBOARD && MAPLE + depends on SH_DREAMCAST && MAPLE help Say Y here if you have a DreamCast console running Linux and have a keyboard attached to its Maple bus. @@ -90,10 +86,12 @@ config KEYBOARD_AMIGA tristate "Amiga keyboard" - depends on AMIGA && INPUT && INPUT_KEYBOARD + depends on AMIGA help Say Y here if you are running Linux on any AMIGA and have a keyboard attached. To compile this driver as a module, choose M here: the module will be called amikbd. + +endif diff -Nru a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig --- a/drivers/input/misc/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/misc/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,9 +1,8 @@ # # Input misc drivers configuration # -config INPUT_MISC - bool "Misc" - depends on INPUT +menuconfig INPUT_MISC + bool "Miscellaneous devices" help Say Y here, and a list of miscellaneous input drivers will be displayed. Everything that didn't fit into the other categories is here. This option @@ -11,9 +10,11 @@ If unsure, say Y. +if INPUT_MISC + config INPUT_PCSPKR tristate "PC Speaker support" - depends on (ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES) && INPUT && INPUT_MISC + depends on ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES help Say Y here if you want the standard PC Speaker to be used for bells and whistles. @@ -25,7 +26,7 @@ config INPUT_SPARCSPKR tristate "SPARC Speaker support" - depends on (SPARC32 || SPARC64) && INPUT && INPUT_MISC && PCI + depends on PCI && (SPARC32 || SPARC64) help Say Y here if you want the standard Speaker on Sparc PCI systems to be used for bells and whistles. @@ -37,11 +38,10 @@ config INPUT_M68K_BEEP tristate "M68k Beeper support" - depends on M68K && INPUT && INPUT_MISC + depends on M68K config INPUT_UINPUT tristate "User level driver support" - depends on INPUT && INPUT_MISC help Say Y here if you want to support user level drivers for input subsystem accessible under char device 10:223 - /dev/input/uinput. @@ -49,3 +49,4 @@ To compile this driver as a module, choose M here: the module will be called uinput. +endif diff -Nru a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig --- a/drivers/input/mouse/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/mouse/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,20 +1,20 @@ # # Mouse driver configuration # -config INPUT_MOUSE - bool "Mice" +menuconfig INPUT_MOUSE + bool "Mouse" default y - depends on INPUT help Say Y here, and a list of supported mice will be displayed. This option doesn't affect the kernel. If unsure, say Y. +if INPUT_MOUSE + config MOUSE_PS2 tristate "PS/2 mouse" default y - depends on INPUT && INPUT_MOUSE select SERIO select SERIO_LIBPS2 select SERIO_I8042 if PC @@ -39,7 +39,6 @@ config MOUSE_SERIAL tristate "Serial mouse" - depends on INPUT && INPUT_MOUSE select SERIO ---help--- Say Y here if you have a serial (RS-232, COM port) mouse connected @@ -53,7 +52,7 @@ config MOUSE_INPORT tristate "InPort/MS/ATIXL busmouse" - depends on INPUT && INPUT_MOUSE && ISA + depends on ISA help Say Y here if you have an InPort, Microsoft or ATI XL busmouse. They are rather rare these days. @@ -69,7 +68,7 @@ config MOUSE_LOGIBM tristate "Logitech busmouse" - depends on INPUT && INPUT_MOUSE && ISA + depends on ISA help Say Y here if you have a Logitech busmouse. They are rather rare these days. @@ -79,7 +78,7 @@ config MOUSE_PC110PAD tristate "IBM PC110 touchpad" - depends on INPUT && INPUT_MOUSE && ISA + depends on ISA help Say Y if you have the IBM PC-110 micro-notebook and want its touchpad supported. @@ -89,7 +88,7 @@ config MOUSE_MAPLE tristate "Maple bus mouse" - depends on SH_DREAMCAST && INPUT && INPUT_MOUSE && MAPLE + depends on SH_DREAMCAST && MAPLE help Say Y if you have a DreamCast console and a mouse attached to its Maple bus. @@ -99,7 +98,7 @@ config MOUSE_AMIGA tristate "Amiga mouse" - depends on AMIGA && INPUT && INPUT_MOUSE + depends on AMIGA help Say Y here if you have an Amiga and want its native mouse supported by the kernel. @@ -109,7 +108,7 @@ config MOUSE_RISCPC tristate "Acorn RiscPC mouse" - depends on ARCH_ACORN && INPUT && INPUT_MOUSE + depends on ARCH_ACORN help Say Y here if you have the Acorn RiscPC computer and want its native mouse supported. @@ -119,7 +118,6 @@ config MOUSE_VSXXXAA tristate "DEC VSXXX-AA/GA mouse and VSXXX-AB tablet" - depends on INPUT && INPUT_MOUSE select SERIO help Say Y (or M) if you want to use a DEC VSXXX-AA (hockey @@ -129,3 +127,4 @@ described in the source file). This driver also works with the digitizer (VSXXX-AB) DEC produced. +endif diff -Nru a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig --- a/drivers/input/serio/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/serio/Kconfig 2005-02-03 19:00:10 -08:00 @@ -2,11 +2,11 @@ # Input core configuration # config SERIO - tristate "Serial i/o support" if EMBEDDED || !X86 + tristate "Serial I/O support" if EMBEDDED || !X86 default y ---help--- Say Yes here if you have any input device that uses serial I/O to - communicate with the system. This includes the + communicate with the system. This includes the * standard AT keyboard and PS/2 mouse * as well as serial mice, Sun keyboards, some joysticks and 6dof devices and more. @@ -16,10 +16,11 @@ To compile this driver as a module, choose M here: the module will be called serio. +if SERIO + config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y - select SERIO depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K ---help--- i8042 is the chip over which the standard AT keyboard and PS/2 @@ -34,7 +35,6 @@ config SERIO_SERPORT tristate "Serial port line discipline" default y - depends on SERIO ---help--- Say Y here if you plan to use an input device (mouse, joystick, tablet, 6dof) that communicates over the RS232 serial (COM) port. @@ -48,7 +48,6 @@ config SERIO_CT82C710 tristate "ct82c710 Aux port controller" - depends on SERIO depends on !PARISC ---help--- Say Y here if you have a Texas Instruments TravelMate notebook @@ -62,11 +61,11 @@ config SERIO_Q40KBD tristate "Q40 keyboard controller" - depends on Q40 && SERIO + depends on Q40 config SERIO_PARKBD tristate "Parallel port keyboard adapter" - depends on SERIO && PARPORT + depends on PARPORT ---help--- Say Y here if you built a simple parallel port adapter to attach an additional AT keyboard, XT keyboard or PS/2 mouse. @@ -80,7 +79,7 @@ config SERIO_RPCKBD tristate "Acorn RiscPC keyboard controller" - depends on (ARCH_ACORN || ARCH_CLPS7500) && SERIO + depends on ARCH_ACORN || ARCH_CLPS7500 default y help Say Y here if you have the Acorn RiscPC and want to use an AT @@ -91,15 +90,15 @@ config SERIO_AMBAKMI tristate "AMBA KMI keyboard controller" - depends on ARM_AMBA && SERIO + depends on ARM_AMBA config SERIO_SA1111 tristate "Intel SA1111 keyboard controller" - depends on SA1111 && SERIO + depends on SA1111 config SERIO_GSCPS2 tristate "HP GSC PS/2 keyboard and PS/2 mouse controller" - depends on GSC && SERIO + depends on GSC default y help This driver provides support for the PS/2 ports on PA-RISC machines @@ -113,7 +112,7 @@ config SERIO_PCIPS2 tristate "PCI PS/2 keyboard and PS/2 mouse controller" - depends on PCI && SERIO + depends on PCI help Say Y here if you have a Mobility Docking station with PS/2 keyboard and mice ports. @@ -123,7 +122,7 @@ config SERIO_MACEPS2 tristate "SGI O2 MACE PS/2 controller" - depends on SGI_IP32 && SERIO + depends on SGI_IP32 help Say Y here if you have SGI O2 workstation and want to use its PS/2 ports. @@ -133,7 +132,6 @@ config SERIO_LIBPS2 tristate "PS/2 driver library" if EMBEDDED - depends on SERIO help Say Y here if you are using a driver for device connected to a PS/2 port, such as PS/2 mouse or standard AT keyboard. @@ -143,7 +141,6 @@ config SERIO_RAW tristate "Raw access to serio ports" - depends on SERIO help Say Y here if you want to have raw access to serio ports, such as AUX ports on i8042 keyboard controller. Each serio port that is @@ -156,3 +153,5 @@ To compile this driver as a module, choose M here: the module will be called serio_raw. + +endif diff -Nru a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig --- a/drivers/input/touchscreen/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/input/touchscreen/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,18 +1,19 @@ # # Mouse driver configuration # -config INPUT_TOUCHSCREEN +menuconfig INPUT_TOUCHSCREEN bool "Touchscreens" - depends on INPUT help Say Y here, and a list of supported touchscreens will be displayed. This option doesn't affect the kernel. If unsure, say Y. +if INPUT_TOUCHSCREEN + config TOUCHSCREEN_BITSY tristate "Compaq iPAQ H3600 (Bitsy) touchscreen input driver" - depends on SA1100_BITSY && INPUT && INPUT_TOUCHSCREEN + depends on SA1100_BITSY select SERIO help Say Y here if you have the h3600 (Bitsy) touchscreen. @@ -24,7 +25,6 @@ config TOUCHSCREEN_GUNZE tristate "Gunze AHL-51S touchscreen" - depends on INPUT && INPUT_TOUCHSCREEN select SERIO help Say Y here if you have the Gunze AHL-51 touchscreen connected to @@ -35,3 +35,4 @@ To compile this driver as a module, choose M here: the module will be called gunze. +endif diff -Nru a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig --- a/drivers/mtd/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/mtd/Kconfig 2005-02-03 19:00:10 -08:00 @@ -27,6 +27,15 @@ help Determines the verbosity level of the MTD debugging messages. +config MTD_CONCAT + tristate "MTD concatenating support" + depends on MTD + help + Support for concatenating several MTD devices into a single + (virtual) one. This allows you to have -for example- a JFFS(2) + file system spanning multiple physical flash chips. If unsure, + say 'Y'. + config MTD_PARTITIONS bool "MTD partitioning support" depends on MTD @@ -39,15 +48,6 @@ Note, however, that you don't need this option for the DiskOnChip devices. Partitioning on NFTL 'devices' is a different - that's the 'normal' form of partitioning used on a block device. - -config MTD_CONCAT - tristate "MTD concatenating support" - depends on MTD - help - Support for concatenating several MTD devices into a single - (virtual) one. This allows you to have -for example- a JFFS(2) - file system spanning multiple physical flash chips. If unsure, - say 'Y'. config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" diff -Nru a/drivers/parport/Kconfig b/drivers/parport/Kconfig --- a/drivers/parport/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/parport/Kconfig 2005-02-03 19:00:10 -08:00 @@ -46,15 +46,9 @@ If unsure, say Y. -config PARPORT_PC_CML1 - tristate - depends on PARPORT!=n && PARPORT_PC!=n - default PARPORT_PC if SERIAL_8250=y - default m if SERIAL_8250=m - config PARPORT_SERIAL tristate "Multi-IO cards (parallel and serial)" - depends on SERIAL_8250!=n && PARPORT_PC_CML1 && PCI + depends on SERIAL_8250 && PARPORT_PC && PCI help This adds support for multi-IO PCI cards that have parallel and serial ports. You should say Y or M here. If you say M, the module @@ -118,8 +112,8 @@ config PARPORT_GSC tristate - depends on GSC - default PARPORT + default GSC + depends on PARPORT config PARPORT_SUNBPP tristate "Sparc hardware (EXPERIMENTAL)" diff -Nru a/drivers/pci/Kconfig b/drivers/pci/Kconfig --- a/drivers/pci/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/pci/Kconfig 2005-02-03 19:00:10 -08:00 @@ -3,8 +3,8 @@ # config PCI_MSI bool "Message Signaled Interrupts (MSI and MSI-X)" + depends on PCI depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 - default n help This allows device drivers to enable MSI (Message Signaled Interrupts). Message Signaled Interrupts enable a device to diff -Nru a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig --- a/drivers/pci/pcie/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/pci/pcie/Kconfig 2005-02-03 19:00:10 -08:00 @@ -3,8 +3,8 @@ # config PCIEPORTBUS bool "PCI Express support" + depends on PCI depends on PCI_GOMMCONFIG || PCI_GOANY - default n ---help--- This automatically enables PCI Express Port Bus support. Users can diff -Nru a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig --- a/drivers/pcmcia/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/pcmcia/Kconfig 2005-02-03 19:00:10 -08:00 @@ -20,9 +20,10 @@ To compile this driver as modules, choose M here: the module will be called pcmcia_core. +if PCCARD + config PCMCIA_DEBUG bool "Enable PCCARD debugging" - depends on PCCARD != n help Say Y here to enable PCMCIA subsystem debugging. You will need to choose the debugging level either via the @@ -41,7 +42,6 @@ config PCMCIA tristate "16-bit PCMCIA support" - depends on PCCARD default y ---help--- This option enables support for 16-bit PCMCIA cards. Most older @@ -60,7 +60,7 @@ config CARDBUS bool "32-bit CardBus support" - depends on PCCARD && PCI + depends on PCI default y ---help--- CardBus is a bus mastering architecture for PC-cards, which allows @@ -77,7 +77,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" - depends on PCCARD && PCI + depends on PCI #fixme: remove dependendcy on CARDBUS depends on CARDBUS select PCCARD_NONSTATIC @@ -197,6 +197,7 @@ config PCCARD_NONSTATIC tristate - depends on PCCARD + +endif # PCCARD endmenu diff -Nru a/drivers/usb/Kconfig b/drivers/usb/Kconfig --- a/drivers/usb/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/usb/Kconfig 2005-02-03 19:00:10 -08:00 @@ -4,6 +4,24 @@ menu "USB support" +# Host-side USB depends on having a host controller +# NOTE: dummy_hcd is always an option, but it's ignored here ... +# NOTE: SL-811 option should be board-specific ... +config USB_ARCH_HAS_HCD + boolean + default y if USB_ARCH_HAS_OHCI + default y if ARM # SL-811 + default PCI + +# many non-PCI hcds implement OHCI +config USB_ARCH_HAS_OHCI + boolean + default y if SA1111 + default y if ARCH_OMAP + default y if ARCH_LH7A404 + default y if PXA27x + default PCI + # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. config USB tristate "Support for Host-side USB" diff -Nru a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/usb/host/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,21 +1,3 @@ -# Host-side USB depends on having a host controller -# NOTE: dummy_hcd is always an option, but it's ignored here ... -# NOTE: SL-811 option should be board-specific ... -config USB_ARCH_HAS_HCD - boolean - default y if USB_ARCH_HAS_OHCI - default y if ARM # SL-811 - default PCI - -# many non-PCI hcds implement OHCI -config USB_ARCH_HAS_OHCI - boolean - default y if SA1111 - default y if ARCH_OMAP - default y if ARCH_LH7A404 - default y if PXA27x - default PCI - # # USB Host Controller Drivers # diff -Nru a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig --- a/drivers/usb/storage/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/usb/storage/Kconfig 2005-02-03 19:00:10 -08:00 @@ -3,6 +3,7 @@ # comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information" + depends on USB config USB_STORAGE tristate "USB Mass Storage support" diff -Nru a/drivers/video/Kconfig b/drivers/video/Kconfig --- a/drivers/video/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/drivers/video/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1062,7 +1062,7 @@ config FB_68328 bool "Motorola 68328 native frame buffer support" - depends on (M68328 || M68EZ328 || M68VZ328) + depends on FB && (M68328 || M68EZ328 || M68VZ328) help Say Y here if you want to support the built-in frame buffer of the Motorola 68328 CPU family. @@ -1081,22 +1081,8 @@ If unsure, say N. -config FB_W100 - tristate "W100 frame buffer support" - depends on FB && PXA_SHARPSL - ---help--- - Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. - - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called vfb. If you want to compile it as a module, - say M here and read . - - If unsure, say N. - config FB_PXA_PARAMETERS bool "PXA LCD command line parameters" - default n depends on FB_PXA ---help--- Enable the use of kernel command line or module parameters @@ -1110,6 +1096,19 @@ option disabled. describes the available parameters. + +config FB_W100 + tristate "W100 frame buffer support" + depends on FB && PXA_SHARPSL + ---help--- + Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. + + This driver is also available as a module ( = code which can be + inserted and removed from the running kernel whenever you want). The + module will be called vfb. If you want to compile it as a module, + say M here and read . + + If unsure, say N. config FB_VIRTUAL tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" diff -Nru a/init/Kconfig b/init/Kconfig --- a/init/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/init/Kconfig 2005-02-03 19:00:10 -08:00 @@ -157,7 +157,6 @@ config AUDIT bool "Auditing support" default y if SECURITY_SELINUX - default n help Enable auditing infrastructure that can be used with another kernel subsystem, such as SELinux (which requires this for @@ -168,29 +167,11 @@ bool "Enable system-call auditing support" depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64) default y if SECURITY_SELINUX - default n help Enable low-overhead system-call auditing infrastructure that can be used independently or with another kernel subsystem, such as SELinux. -config LOG_BUF_SHIFT - int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL - range 12 21 - default 17 if ARCH_S390 - default 16 if X86_NUMAQ || IA64 - default 15 if SMP - default 14 - help - Select kernel log buffer size as a power of 2. - Defaults and Examples: - 17 => 128 KB for S/390 - 16 => 64 KB for x86 NUMAQ or IA-64 - 15 => 32 KB for SMP - 14 => 16 KB for uniprocessor - 13 => 8 KB - 12 => 4 KB - config HOTPLUG bool "Support for hot-pluggable devices" if !ARCH_S390 default ARCH_S390 @@ -294,7 +275,6 @@ config CC_OPTIMIZE_FOR_SIZE bool "Optimize for size" if EMBEDDED default y if ARM || H8300 - default n help Enabling this option will pass "-Os" instead of "-O2" to gcc resulting in a smaller kernel. diff -Nru a/lib/Kconfig.debug b/lib/Kconfig.debug --- a/lib/Kconfig.debug 2005-02-03 19:00:10 -08:00 +++ b/lib/Kconfig.debug 2005-02-03 19:00:10 -08:00 @@ -1,14 +1,13 @@ config DEBUG_KERNEL bool "Kernel debugging" - depends on (ALPHA || ARM || CRIS || H8300 || X86 || IA64 || M32R || M68K || M68KNOMMU || MIPS || PARISC || PPC32 || PPC64 || ARCH_S390 || SUPERH || SUPERH64 || SPARC32 || SPARC64 || USERMODE || V850 || X86_64) help Say Y here if you are developing drivers or trying to debug and identify kernel problems. config MAGIC_SYSRQ bool "Magic SysRq key" - depends on DEBUG_KERNEL && (ALPHA || ARM || X86 || IA64 || M32R || M68K || MIPS || PARISC || PPC32 || PPC64 || ARCH_S390 || SUPERH || SUPERH64 || SPARC32 || SPARC64 || X86_64 || USERMODE) + depends on DEBUG_KERNEL help If you say Y here, you will have some control over the system even if the system crashes for example during kernel debugging (e.g., you @@ -20,12 +19,22 @@ keys are documented in . Don't say Y unless you really know what this hack does. -config MAGIC_SYSRQ - bool "Magic SysRq key" - depends on DEBUG_KERNEL && (H8300 || M68KNOMMU || V850) - help - Enables console device to interpret special characters as - commands to dump state information. +config LOG_BUF_SHIFT + int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL + range 12 21 + default 17 if ARCH_S390 + default 16 if X86_NUMAQ || IA64 + default 15 if SMP + default 14 + help + Select kernel log buffer size as a power of 2. + Defaults and Examples: + 17 => 128 KB for S/390 + 16 => 64 KB for x86 NUMAQ or IA-64 + 15 => 32 KB for SMP + 14 => 16 KB for uniprocessor + 13 => 8 KB + 12 => 4 KB config SCHEDSTATS bool "Collect scheduler statistics" @@ -41,7 +50,7 @@ config DEBUG_SLAB bool "Debug memory allocations" - depends on DEBUG_KERNEL && (ALPHA || ARM || X86 || IA64 || M32R || M68K || MIPS || PARISC || PPC32 || PPC64 || ARCH_S390 || SPARC32 || SPARC64 || USERMODE || X86_64) + depends on DEBUG_KERNEL help Say Y here to have the kernel do limited verification on memory allocation as well as poisoning memory on free to catch use of freed @@ -49,7 +58,7 @@ config DEBUG_PREEMPT bool "Debug preemptible kernel" - depends on PREEMPT + depends on DEBUG_KERNEL && PREEMPT default y help If you say Y here then the kernel will use a debug variant of the @@ -59,7 +68,7 @@ config DEBUG_SPINLOCK bool "Spinlock debugging" - depends on DEBUG_KERNEL && (ALPHA || ARM || X86 || IA64 || M32R || MIPS || PARISC || PPC32 || (SUPERH && !SUPERH64) || SPARC32 || SPARC64 || USERMODE || X86_64) + depends on DEBUG_KERNEL help Say Y here and build SMP to catch missing spinlock initialization and certain other kinds of spinlock errors commonly made. This is @@ -68,7 +77,7 @@ config DEBUG_SPINLOCK_SLEEP bool "Sleep-inside-spinlock checking" - depends on DEBUG_KERNEL && (X86 || IA64 || M32R || MIPS || PPC32 || PPC64 || ARCH_S390 || SPARC32 || SPARC64 || USERMODE) + depends on DEBUG_KERNEL help If you say Y here, various routines which may sleep will become very noisy if they are called with a spinlock held. @@ -82,7 +91,7 @@ config DEBUG_HIGHMEM bool "Highmem debugging" - depends on DEBUG_KERNEL && HIGHMEM && (X86 || PPC32 || MIPS || SPARC32) + depends on DEBUG_KERNEL && HIGHMEM help This options enables addition error checking for high memory systems. Disable for production systems. @@ -98,7 +107,7 @@ config DEBUG_INFO bool "Compile the kernel with debug info" - depends on DEBUG_KERNEL && (ALPHA || CRIS || X86 || IA64 || M32R || M68K || MIPS || PARISC || PPC32 || PPC64 || ARCH_S390 || (SUPERH && !SUPERH64) || SPARC64 || V850 || X86_64) + depends on DEBUG_KERNEL help If you say Y here the resulting kernel image will include debugging info resulting in a larger kernel image. @@ -109,13 +118,13 @@ bool "Enable kernel debugging symbols" depends on DEBUG_KERNEL && USERMODE help - When this is enabled, the User-Mode Linux binary will include - debugging symbols. This enlarges the binary by a few megabytes, - but aids in tracking down kernel problems in UML. It is required - if you intend to do any kernel development. + When this is enabled, the User-Mode Linux binary will include + debugging symbols. This enlarges the binary by a few megabytes, + but aids in tracking down kernel problems in UML. It is required + if you intend to do any kernel development. - If you're truly short on disk space or don't expect to report any - bugs back to the UML developers, say N, otherwise say Y. + If you're truly short on disk space or don't expect to report any + bugs back to the UML developers, say N, otherwise say Y. config DEBUG_IOREMAP bool "Enable ioremap() debugging" @@ -140,13 +149,11 @@ If unsure, say N. -if !X86_64 config FRAME_POINTER bool "Compile the kernel with frame pointers" - depends on X86 || CRIS || M68KNOMMU + depends on DEBUG_KERNEL && ((X86 && !X86_64) || CRIS || M68K || M68KNOMMU) help If you say Y here the resulting kernel image will be slightly larger and slower, but it will give very useful debugging information. If you don't debug the kernel, you can say N, but we may not be able to solve problems without frame pointers. -endif diff -Nru a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c --- a/scripts/kconfig/gconf.c 2005-02-03 19:00:10 -08:00 +++ b/scripts/kconfig/gconf.c 2005-02-03 19:00:10 -08:00 @@ -11,7 +11,6 @@ #endif #include "lkc.h" -#include "images.c" #include #include @@ -1142,6 +1141,39 @@ /* Conf management */ +static const char *xpm_menu[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" ", +" . ", +" .. ", +" ... ", +" .... ", +" ..... ", +" .... ", +" ... ", +" .. ", +" . ", +" "}; + +static const char *xpm_void[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; /* Fill a row of strings */ static gchar **fill_row(struct menu *menu) diff -Nru a/sound/core/Kconfig b/sound/core/Kconfig --- a/sound/core/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/sound/core/Kconfig 2005-02-03 19:00:10 -08:00 @@ -1,16 +1,20 @@ # ALSA soundcard-configuration config SND_TIMER tristate + depends on SND config SND_PCM tristate select SND_TIMER + depends on SND config SND_HWDEP tristate + depends on SND config SND_RAWMIDI tristate + depends on SND config SND_SEQUENCER tristate "Sequencer support" @@ -40,6 +44,7 @@ config SND_OSSEMUL bool + depends on SND config SND_MIXER_OSS tristate "OSS Mixer API" @@ -70,7 +75,7 @@ config SND_SEQUENCER_OSS bool "OSS Sequencer API" - depends on SND_SEQUENCER + depends on SND && SND_SEQUENCER select SND_OSSEMUL help Say Y here to enable OSS sequencer emulation (both diff -Nru a/sound/oss/Kconfig b/sound/oss/Kconfig --- a/sound/oss/Kconfig 2005-02-03 19:00:10 -08:00 +++ b/sound/oss/Kconfig 2005-02-03 19:00:10 -08:00 @@ -858,6 +858,10 @@ You can say M here to compile this driver as a module; the module is called sb. +config SOUND_KAHLUA + tristate "XpressAudio Sound Blaster emulation" + depends on SOUND_SB + config SOUND_AWE32_SYNTH tristate "AWE32 synth" depends on SOUND_OSS @@ -1081,10 +1085,6 @@ help Support for audio mixer facilities on the BT848 TV frame-grabber card. - -config SOUND_KAHLUA - tristate "XpressAudio Sound Blaster emulation" - depends on SOUND_SB config SOUND_ALI5455 tristate "ALi5455 audio support"