[PATCH 0/30] Use menuconfig objects

[PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

Hello list,


the following patch series turns some menus into menuconfigs, so they 
can be disabled whilst "walking" thorugh the parent menu (check the 
videos [1], [2] to see what I mean), enabling for disabling lots of 
options _quickly_.

I'll send the patches (as a reply to this mail) piece by piece out
when I figure out the maintainers to Cc for each.

[1] 6.04 MB(1000s) 70 sec http://jengelh.hopto.org/mc/without.ogg
[2] 1.96 MB(1000s) 44 sec http://jengelh.hopto.org/mc/with.ogg
(Ogg container, Theora Video, no audio)

I have not poked on all subsystems (it is quite a lot), but I can 
already give a glimpse (`ls -1`) of who gets one and who does not.
And, I am not completely finished changing some subsystems - but
the patches are already big enough for a first wave. I want to get
some feedback first. Thanks!

`ls -1`:
	menuconfig-acpi.diff
	menuconfig-apm.diff
	menuconfig-ata.diff
	menuconfig-block.diff
	menuconfig-connector.diff
	menuconfig-crypto.diff
	menuconfig-crypto2.diff
	menuconfig-dccp.diff
	menuconfig-fusion.diff
	menuconfig-i2c.diff
	menuconfig-i2o.diff
	menuconfig-ide.diff
	menuconfig-ieee1394.diff
	menuconfig-md.diff
	menuconfig-modules.diff
	menuconfig-mtd.diff
	menuconfig-net-ipvs.diff
	menuconfig-net-sctp.diff
	menuconfig-net-tipc.diff
	menuconfig-netdev-arcnet.diff
	menuconfig-netdev-phy.diff
	menuconfig-netdev-tr.diff
	menuconfig-netdev.diff
	menuconfig-oldcd.diff
	menuconfig-parport.diff
	menuconfig-pcihotplug.diff
	menuconfig-pcmcia.diff
	menuconfig-pnp.diff
	menuconfig-scsi.diff
	menuconfig-w1.diff



Jan
-- 

[PATCH 01/30] Use menuconfig objects - ACPI

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at 
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/acpi/Kconfig
+++ linux-2.6.21-rc5/drivers/acpi/Kconfig
@@ -2,16 +2,12 @@
 # ACPI Configuration
 #
 
-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+	bool "ACPI Support (Advanced Configuration and Power Interface) Support"
 	depends on !X86_NUMAQ
 	depends on !X86_VISWS
 	depends on !IA64_HP_SIM
 	depends on IA64 || X86
-	depends on PM
-
-config ACPI
-	bool "ACPI Support"
-	depends on IA64 || X86
 	depends on PCI
 	depends on PM
 	select PNP
@@ -49,7 +45,6 @@ if ACPI
 config ACPI_SLEEP
 	bool "Sleep States"
 	depends on X86 && (!SMP || SUSPEND_SMP)
-	depends on PM
 	default y
 	---help---
 	  This option adds support for ACPI suspend states. 
@@ -82,7 +77,6 @@ config ACPI_SLEEP_PROC_SLEEP
 
 config ACPI_PROCFS
 	bool "Procfs interface (deprecated)"
-	depends on ACPI
 	default y
 	---help---
 	  Procfs interface for ACPI is made optional for back-compatible.
@@ -367,7 +361,6 @@ config ACPI_CONTAINER
 
 config ACPI_HOTPLUG_MEMORY
 	tristate "Memory Hotplug"
-	depends on ACPI
 	depends on MEMORY_HOTPLUG
 	default n
 	help
@@ -397,5 +390,3 @@ config ACPI_SBS
 	  to today's ACPI "Control Method" battery.
 
 endif	# ACPI
-
-endmenu
#<EOF>

[PATCH 02/30] Use menuconfig objects - APM

[Jan Engelhardt]

(I hope Andi is the right one to Cc, otherwise please add, thanks!)


Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/arch/i386/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/arch/i386/Kconfig
+++ linux-2.6.21-rc5/arch/i386/Kconfig
@@ -915,12 +915,9 @@ source kernel/power/Kconfig
 
 source "drivers/acpi/Kconfig"
 
-menu "APM (Advanced Power Management) BIOS Support"
-depends on PM && !X86_VISWS
-
-config APM
+menuconfig APM
 	tristate "APM (Advanced Power Management) BIOS support"
-	depends on PM
+	depends on PM && !X86_VISWS
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with
@@ -977,9 +974,10 @@ config APM
 	  To compile this driver as a module, choose M here: the
 	  module will be called apm.
 
+if APM
+
 config APM_IGNORE_USER_SUSPEND
 	bool "Ignore USER SUSPEND"
-	depends on APM
 	help
 	  This option will ignore USER SUSPEND requests. On machines with a
 	  compliant APM BIOS, you want to say N. However, on the NEC Versa M
@@ -987,7 +985,6 @@ config APM_IGNORE_USER_SUSPEND
 
 config APM_DO_ENABLE
 	bool "Enable PM at boot time"
-	depends on APM
 	---help---
 	  Enable APM features at boot time. From page 36 of the APM BIOS
 	  specification: "When disabled, the APM BIOS does not automatically
@@ -1005,7 +1002,6 @@ config APM_DO_ENABLE
 
 config APM_CPU_IDLE
 	bool "Make CPU Idle calls when idle"
-	depends on APM
 	help
 	  Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop.
 	  On some machines, this can activate improved power savings, such as
@@ -1017,7 +1013,6 @@ config APM_CPU_IDLE
 
 config APM_DISPLAY_BLANK
 	bool "Enable console blanking using APM"
-	depends on APM
 	help
 	  Enable console blanking using the APM. Some laptops can use this to
 	  turn off the LCD backlight when the screen blanker of the Linux
@@ -1031,7 +1026,6 @@ config APM_DISPLAY_BLANK
 
 config APM_RTC_IS_GMT
 	bool "RTC stores time in GMT"
-	depends on APM
 	help
 	  Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
 	  stores the time in GMT (Greenwich Mean Time). Say N if your RTC
@@ -1044,7 +1038,6 @@ config APM_RTC_IS_GMT
 
 config APM_ALLOW_INTS
 	bool "Allow interrupts during APM BIOS calls"
-	depends on APM
 	help
 	  Normally we disable external interrupts while we are making calls to
 	  the APM BIOS as a measure to lessen the effects of a badly behaving
@@ -1055,13 +1048,12 @@ config APM_ALLOW_INTS
 
 config APM_REAL_MODE_POWER_OFF
 	bool "Use real mode APM BIOS call to power off"
-	depends on APM
 	help
 	  Use real mode APM BIOS calls to switch off the computer. This is
 	  a work-around for a number of buggy BIOSes. Switch this option on if
 	  your computer crashes instead of powering off properly.
 
-endmenu
+endif # APM
 
 source "arch/i386/kernel/cpu/cpufreq/Kconfig"
 
#<EOF>

[PATCH 03/30] Use menuconfig objects - libata

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/ata/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/ata/Kconfig
+++ linux-2.6.21-rc5/drivers/ata/Kconfig
@@ -2,10 +2,8 @@
 # SATA/PATA driver configuration
 #
 
-menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
-
-config ATA
-	tristate "ATA device support"
+menuconfig ATA
+	tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 	depends on BLOCK
 	depends on !(M32R || M68K) || BROKEN
 	depends on !SUN4 || BROKEN
@@ -571,6 +569,4 @@ config PATA_SCC
 
 	  If unsure, say N.
 
-endif
-endmenu
-
+endif # ATA
#<EOF>

[PATCH 04/30] Use menuconfig objects - block layer

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/block/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/block/Kconfig
+++ linux-2.6.21-rc5/block/Kconfig
@@ -1,7 +1,7 @@
 #
 # Block layer core configuration
 #
-config BLOCK
+menuconfig BLOCK
        bool "Enable the block layer" if EMBEDDED
        default y
        help
@@ -49,6 +49,6 @@ config LSF
 
 	  If unsure, say Y.
 
-endif
+endif # BLOCK
 
 source block/Kconfig.iosched
#<EOF>

[PATCH 05/30] Use menuconfig objects - connector

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/connector/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/connector/Kconfig
+++ linux-2.6.21-rc5/drivers/connector/Kconfig
@@ -1,6 +1,5 @@
-menu "Connector - unified userspace <-> kernelspace linker"
 
-config CONNECTOR
+menuconfig CONNECTOR
 	tristate "Connector - unified userspace <-> kernelspace linker"
 	depends on NET
 	---help---
@@ -10,6 +9,8 @@ config CONNECTOR
 	  Connector support can also be built as a module.  If so, the module
 	  will be called cn.ko.
 
+if CONNECTOR
+
 config PROC_EVENTS
 	boolean "Report process events to userspace"
 	depends on CONNECTOR=y
@@ -18,4 +19,4 @@ config PROC_EVENTS
 	  Provide a connector that reports process events to userspace. Send
 	  events such as fork, exec, id change (uid, gid, suid, etc), and exit.
 
-endmenu
+endif # CONNECTOR
#<EOF>

[PATCH 06/30] Use menuconfig objects - crypto

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/crypto/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/crypto/Kconfig
+++ linux-2.6.21-rc5/crypto/Kconfig
@@ -2,9 +2,7 @@
 # Cryptographic API Configuration
 #
 
-menu "Cryptographic options"
-
-config CRYPTO
+menuconfig CRYPTO
 	bool "Cryptographic API"
 	help
 	  This option provides the core Cryptographic API.
@@ -450,5 +448,3 @@ config CRYPTO_TEST
 source "drivers/crypto/Kconfig"
 
 endif	# if CRYPTO
-
-endmenu
#<EOF>

[PATCH 07/30] Use menuconfig objects - crypto hw

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/crypto/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/crypto/Kconfig
+++ linux-2.6.21-rc5/drivers/crypto/Kconfig
@@ -1,4 +1,9 @@
-menu "Hardware crypto devices"
+
+menuconfig CRYPTO_HW
+	bool "Hardware crypto devices"
+	default y
+
+if CRYPTO_HW
 
 config CRYPTO_DEV_PADLOCK
 	tristate "Support for VIA PadLock ACE"
@@ -66,4 +71,4 @@ config CRYPTO_DEV_GEODE
 	  To compile this driver as a module, choose M here: the module
 	  will be called geode-aes.
 
-endmenu
+endif # CRYPTO_HW
#<EOF>

[PATCH 08/30] Use menuconfig objects - DCCP

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/dccp/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/net/dccp/Kconfig
+++ linux-2.6.21-rc5/net/dccp/Kconfig
@@ -1,8 +1,6 @@
-menu "DCCP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
-config IP_DCCP
+menuconfig IP_DCCP
 	tristate "The DCCP Protocol (EXPERIMENTAL)"
+	depends on INET && EXPERIMENTAL
 	---help---
 	  Datagram Congestion Control Protocol (RFC 4340)
 
@@ -19,19 +17,20 @@ config IP_DCCP
 
 	  If in doubt, say N.
 
+if IP_DCCP
+
 config INET_DCCP_DIAG
-	depends on IP_DCCP && INET_DIAG
+	depends on INET_DIAG
 	def_tristate y if (IP_DCCP = y && INET_DIAG = y)
 	def_tristate m
 
 config IP_DCCP_ACKVEC
-	depends on IP_DCCP
 	bool
 
 source "net/dccp/ccids/Kconfig"
 
 menu "DCCP Kernel Hacking"
-	depends on IP_DCCP && DEBUG_KERNEL=y
+	depends on DEBUG_KERNEL=y
 
 config IP_DCCP_DEBUG
 	bool "DCCP debug messages"
@@ -61,4 +60,4 @@ config NET_DCCPPROBE
 
 endmenu
 
-endmenu
+endif # IP_DDCP
#<EOF>

[PATCH 09/30] Use menuconfig objects - fusion

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/message/fusion/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/message/fusion/Kconfig
+++ linux-2.6.21-rc5/drivers/message/fusion/Kconfig
@@ -1,14 +1,13 @@
 
-menu "Fusion MPT device support"
+menuconfig FUSION
+	bool "Fusion MPT device support"
+	default y
 
-config FUSION
-	bool
-	default n
+if FUSION
 
 config FUSION_SPI
 	tristate "Fusion MPT ScsiHost drivers for SPI"
 	depends on PCI && SCSI
-	select FUSION
 	select SCSI_SPI_ATTRS
 	---help---
 	  SCSI HOST support for a parallel SCSI host adapters.
@@ -23,7 +22,6 @@ config FUSION_SPI
 config FUSION_FC
 	tristate "Fusion MPT ScsiHost drivers for FC"
 	depends on PCI && SCSI
-	select FUSION
 	select SCSI_FC_ATTRS
 	---help---
 	  SCSI HOST support for a Fiber Channel host adapters.
@@ -40,7 +38,6 @@ config FUSION_FC
 config FUSION_SAS
 	tristate "Fusion MPT ScsiHost drivers for SAS"
 	depends on PCI && SCSI
- 	select FUSION
 	select SCSI_SAS_ATTRS
 	---help---
 	  SCSI HOST support for a SAS host adapters.
@@ -54,7 +51,6 @@ config FUSION_SAS
 
 config FUSION_MAX_SGE
 	int "Maximum number of scatter gather entries (16 - 128)"
-	depends on FUSION
 	default "128"
 	range 16 128
 	help
@@ -100,4 +96,4 @@ config FUSION_LAN
 
 	  If unsure whether you really want or need this, say N.
 
-endmenu
+endif # FUSION
#<EOF>

[PATCH 10/30] Use menuconfig objects - I2C

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/i2c/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/i2c/Kconfig
+++ linux-2.6.21-rc5/drivers/i2c/Kconfig
@@ -2,9 +2,7 @@
 # I2C subsystem configuration
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
 	  I2C (pronounce: I-square-C) is a slow serial bus protocol used in
@@ -22,9 +20,10 @@ config I2C
 	  This I2C support can also be built as a module.  If so, the module
 	  will be called i2c-core.
 
+if I2C
+
 config I2C_CHARDEV
 	tristate "I2C device interface"
-	depends on I2C
 	help
 	  Say Y here to use i2c-* device files, usually found in the /dev
 	  directory on your system.  They make it possible to have user-space
@@ -40,7 +39,6 @@ source drivers/i2c/chips/Kconfig
 
 config I2C_DEBUG_CORE
 	bool "I2C Core debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C core to produce a bunch of debug
 	  messages to the system log.  Select this if you are having a
@@ -48,7 +46,6 @@ config I2C_DEBUG_CORE
 
 config I2C_DEBUG_ALGO
 	bool "I2C Algorithm debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C algorithm drivers to produce a bunch
 	  of debug messages to the system log.  Select this if you are having
@@ -57,7 +54,6 @@ config I2C_DEBUG_ALGO
 
 config I2C_DEBUG_BUS
 	bool "I2C Bus debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C bus drivers to produce a bunch of
 	  debug messages to the system log.  Select this if you are having
@@ -66,12 +62,10 @@ config I2C_DEBUG_BUS
 
 config I2C_DEBUG_CHIP
 	bool "I2C Chip debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C chip drivers to produce a bunch of
 	  debug messages to the system log.  Select this if you are having
 	  a problem with I2C support and want to see more of what is going
 	  on.
 
-endmenu
-
+endif # I2C
Index: linux-2.6.21-rc5/drivers/i2c/algos/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/i2c/algos/Kconfig
+++ linux-2.6.21-rc5/drivers/i2c/algos/Kconfig
@@ -3,11 +3,9 @@
 #
 
 menu "I2C Algorithms"
-	depends on I2C
 
 config I2C_ALGOBIT
 	tristate "I2C bit-banging interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called bit-banging
 	  adapters.  Say Y if you own an I2C adapter belonging to this class
@@ -18,7 +16,6 @@ config I2C_ALGOBIT
 
 config I2C_ALGOPCF
 	tristate "I2C PCF 8584 interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called PCF adapters.
 	  Say Y if you own an I2C adapter belonging to this class and then say
@@ -29,7 +26,6 @@ config I2C_ALGOPCF
 
 config I2C_ALGOPCA
 	tristate "I2C PCA 9564 interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called PCA adapters.
 	  Say Y if you own an I2C adapter belonging to this class and then say
@@ -40,11 +36,11 @@ config I2C_ALGOPCA
 
 config I2C_ALGO8XX
 	tristate "MPC8xx CPM I2C interface"
-	depends on 8xx && I2C
+	depends on 8xx
 
 config I2C_ALGO_SGI
 	tristate "I2C SGI interfaces"
-	depends on I2C && (SGI_IP22 || SGI_IP32 || X86_VISWS)
+	depends on SGI_IP22 || SGI_IP32 || X86_VISWS
 	help
 	  Supports the SGI interfaces like the ones found on SGI Indy VINO
 	  or SGI O2 MACE.
Index: linux-2.6.21-rc5/drivers/i2c/busses/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/i2c/busses/Kconfig
+++ linux-2.6.21-rc5/drivers/i2c/busses/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "I2C Hardware Bus support"
-	depends on I2C
 
 config I2C_ALI1535
 	tristate "ALI 1535"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -19,7 +18,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
 	tristate "ALI 1563"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -31,7 +30,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
 	tristate "ALI 15x3"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the
 	  Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +40,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
 	tristate "AMD 756/766/768/8111 and nVidia nForce"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the AMD
 	  756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -66,7 +65,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
 	tristate "AMD 8111"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the
 	  second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -76,14 +75,14 @@ config I2C_AMD8111
 
 config I2C_AT91
 	tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
-	depends on I2C && ARCH_AT91 && EXPERIMENTAL
+	depends on ARCH_AT91 && EXPERIMENTAL
 	help
 	  This supports the use of the I2C interface on Atmel AT91
 	  processors.
 
 config I2C_AU1550
 	tristate "Au1550/Au1200 SMBus interface"
-	depends on I2C && (SOC_AU1550 || SOC_AU1200)
+	depends on SOC_AU1550 || SOC_AU1200
 	help
 	  If you say yes to this option, support will be included for the
 	  Au1550 and Au1200 SMBus interface.
@@ -93,7 +92,7 @@ config I2C_AU1550
 
 config I2C_ELEKTOR
 	tristate "Elektor ISA card"
-	depends on I2C && ISA && BROKEN_ON_SMP
+	depends on ISA && BROKEN_ON_SMP
 	select I2C_ALGOPCF
 	help
 	  This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
@@ -104,7 +103,7 @@ config I2C_ELEKTOR
 
 config I2C_HYDRA
 	tristate "CHRP Apple Hydra Mac I/O I2C interface"
-	depends on I2C && PCI && PPC_CHRP && EXPERIMENTAL
+	depends on PCI && PPC_CHRP && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  This supports the use of the I2C interface in the Apple Hydra Mac
@@ -116,7 +115,7 @@ config I2C_HYDRA
 
 config I2C_I801
 	tristate "Intel 82801 (ICH)"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  801 family of mainboard I2C interfaces.  Specifically, the following
@@ -139,7 +138,7 @@ config I2C_I801
 
 config I2C_I810
 	tristate "Intel 810/815"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the Intel
@@ -156,7 +155,7 @@ config I2C_I810
 
 config I2C_PXA
 	tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
-	depends on I2C && EXPERIMENTAL && ARCH_PXA
+	depends on EXPERIMENTAL && ARCH_PXA
 	help
 	  If you have devices in the PXA I2C bus, say yes to this option.
 	  This driver can also be built as a module.  If so, the module
@@ -172,7 +171,7 @@ config I2C_PXA_SLAVE
 
 config I2C_PIIX4
 	tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  PIIX4 family of mainboard I2C interfaces.  Specifically, the following
@@ -195,7 +194,7 @@ config I2C_PIIX4
 
 config I2C_IBM_IIC
 	tristate "IBM PPC 4xx on-chip I2C interface"
-	depends on IBM_OCP && I2C
+	depends on IBM_OCP
 	help
 	  Say Y here if you want to use IIC peripheral found on 
 	  embedded IBM PPC 4xx based systems. 
@@ -205,7 +204,7 @@ config I2C_IBM_IIC
 
 config I2C_IOP3XX
 	tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
-	depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
+	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
 	help
 	  Say Y here if you want to use the IIC bus controller on
 	  the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
@@ -215,11 +214,10 @@ config I2C_IOP3XX
 
 config I2C_ISA
 	tristate
-	depends on I2C
 
 config I2C_IXP4XX
 	tristate "IXP4xx GPIO-Based I2C Interface"
-	depends on I2C && ARCH_IXP4XX
+	depends on ARCH_IXP4XX
 	select I2C_ALGOBIT
 	help
 	  Say Y here if you have an Intel IXP4xx(420,421,422,425) based 
@@ -230,7 +228,7 @@ config I2C_IXP4XX
 
 config I2C_IXP2000
 	tristate "IXP2000 GPIO-Based I2C Interface"
-	depends on I2C && ARCH_IXP2000
+	depends on ARCH_IXP2000
 	select I2C_ALGOBIT
 	help
 	  Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based 
@@ -241,7 +239,7 @@ config I2C_IXP2000
 
 config I2C_POWERMAC
 	tristate "Powermac I2C interface"
-	depends on I2C && PPC_PMAC
+	depends on PPC_PMAC
 	default y
 	help
 	  This exposes the various PowerMac i2c interfaces to the linux i2c
@@ -253,7 +251,7 @@ config I2C_POWERMAC
 
 config I2C_MPC
 	tristate "MPC107/824x/85xx/52xx/86xx"
-	depends on I2C && PPC32
+	depends on PPC32
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
@@ -265,7 +263,7 @@ config I2C_MPC
 
 config I2C_NFORCE2
 	tristate "Nvidia nForce2, nForce3 and nForce4"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Nvidia
 	  nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
@@ -275,7 +273,7 @@ config I2C_NFORCE2
 
 config I2C_OCORES
 	tristate "OpenCores I2C Controller"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  OpenCores I2C controller. For details see
@@ -286,7 +284,7 @@ config I2C_OCORES
 
 config I2C_OMAP
 	tristate "OMAP I2C adapter"
-	depends on I2C && ARCH_OMAP
+	depends on ARCH_OMAP
 	default y if MACH_OMAP_H3 || MACH_OMAP_OSK
 	help
 	  If you say yes to this option, support will be included for the
@@ -296,7 +294,7 @@ config I2C_OMAP
 
 config I2C_PARPORT
 	tristate "Parallel port adapter"
-	depends on I2C && PARPORT
+	depends on PARPORT
 	select I2C_ALGOBIT
 	help
 	  This supports parallel port I2C adapters such as the ones made by
@@ -320,7 +318,6 @@ config I2C_PARPORT
 
 config I2C_PARPORT_LIGHT
 	tristate "Parallel port adapter (light)"
-	depends on I2C
 	select I2C_ALGOBIT
 	help
 	  This supports parallel port I2C adapters such as the ones made by
@@ -344,14 +341,14 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PASEMI
 	tristate "PA Semi SMBus interface"
-#	depends on PPC_PASEMI && I2C && PCI
-	depends on I2C && PCI
+#	depends on PPC_PASEMI && PCI
+	depends on PCI
 	help
 	  Supports the PA Semi PWRficient on-chip SMBus interfaces.
 
 config I2C_PROSAVAGE
 	tristate "S3/VIA (Pro)Savage"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the
@@ -366,19 +363,19 @@ config I2C_PROSAVAGE
 
 config I2C_RPXLITE
 	tristate "Embedded Planet RPX Lite/Classic support"
-	depends on (RPXLITE || RPXCLASSIC) && I2C
+	depends on RPXLITE || RPXCLASSIC
 	select I2C_ALGO8XX
 
 config I2C_S3C2410
 	tristate "S3C2410 I2C Driver"
-	depends on I2C && ARCH_S3C2410
+	depends on ARCH_S3C2410
 	help
 	  Say Y here to include support for I2C controller in the
 	  Samsung S3C2410 based System-on-Chip devices.
 
 config I2C_SAVAGE4
 	tristate "S3 Savage 4"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the 
@@ -389,13 +386,13 @@ config I2C_SAVAGE4
 
 config I2C_SIBYTE
 	tristate "SiByte SMBus interface"
-	depends on SIBYTE_SB1xxx_SOC && I2C
+	depends on SIBYTE_SB1xxx_SOC
 	help
 	  Supports the SiByte SOC on-chip I2C interfaces (2 channels).
 
 config SCx200_I2C
 	tristate "NatSemi SCx200 I2C using GPIO pins"
-	depends on SCx200_GPIO && I2C
+	depends on SCx200_GPIO
 	select I2C_ALGOBIT
 	help
 	  Enable the use of two GPIO pins of a SCx200 processor as an I2C bus.
@@ -423,7 +420,7 @@ config SCx200_I2C_SDA
 
 config SCx200_ACB
 	tristate "Geode ACCESS.bus support"
-	depends on X86_32 && I2C && PCI
+	depends on X86_32 && PCI
 	help
 	  Enable the use of the ACCESS.bus controllers on the Geode SCx200 and
 	  SC1100 processors and the CS5535 and CS5536 Geode companion devices.
@@ -435,7 +432,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
 	tristate "SiS 5595"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS5595 SMBus (a subset of I2C) interface.
@@ -445,7 +442,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
 	tristate "SiS 630/730"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -455,7 +452,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
 	tristate "SiS 96x"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the SiS
 	  96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -473,7 +470,7 @@ config I2C_SIS96X
 
 config I2C_STUB
 	tristate "I2C/SMBus Test Stub"
-	depends on I2C && EXPERIMENTAL && 'm'
+	depends on EXPERIMENTAL && m
 	default 'n'
 	help
 	  This module may be useful to developers of SMBus client drivers,
@@ -486,7 +483,7 @@ config I2C_STUB
 
 config I2C_VERSATILE
 	tristate "ARM Versatile/Realview I2C bus support"
-	depends on I2C && (ARCH_VERSATILE || ARCH_REALVIEW)
+	depends on ARCH_VERSATILE || ARCH_REALVIEW
 	select I2C_ALGOBIT
 	help
 	  Say yes if you want to support the I2C serial bus on ARMs Versatile
@@ -497,7 +494,7 @@ config I2C_VERSATILE
 
 config I2C_ACORN
 	bool "Acorn IOC/IOMD I2C bus support"
-	depends on I2C && ARCH_ACORN
+	depends on ARCH_ACORN
 	default y
 	select I2C_ALGOBIT
 	help
@@ -507,7 +504,7 @@ config I2C_ACORN
 
 config I2C_VIA
 	tristate "VIA 82C586B"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the VIA
@@ -518,7 +515,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
 	tristate "VIA VT82C596/82C686/82xx and CX700"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the VIA
 	  VT82C596 and later SMBus interface.  Specifically, the following
@@ -537,7 +534,7 @@ config I2C_VIAPRO
 
 config I2C_VOODOO3
 	tristate "Voodoo 3"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the
@@ -548,7 +545,6 @@ config I2C_VOODOO3
 
 config I2C_PCA_ISA
 	tristate "PCA9564 on an ISA bus"
-	depends on I2C
 	select I2C_ALGOPCA
 	default n
 	help
@@ -565,7 +561,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
 	tristate "Marvell mv64xxx I2C Controller"
-	depends on I2C && MV64X60 && EXPERIMENTAL
+	depends on MV64X60 && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in I2C interface on the Marvell 64xxx line of host bridges.
@@ -575,7 +571,7 @@ config I2C_MV64XXX
 
 config I2C_PNX
 	tristate "I2C bus support for Philips PNX targets"
-	depends on ARCH_PNX4008 && I2C
+	depends on ARCH_PNX4008
 	help
 	  This driver supports the Philips IP3204 I2C IP block master and/or
 	  slave controller
Index: linux-2.6.21-rc5/drivers/i2c/chips/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/i2c/chips/Kconfig
+++ linux-2.6.21-rc5/drivers/i2c/chips/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "Miscellaneous I2C Chip support"
-	depends on I2C
 
 config SENSORS_DS1337
 	tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS1337 and DS1339 real-time clock chips.
@@ -17,7 +16,7 @@ config SENSORS_DS1337
 
 config SENSORS_DS1374
 	tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS1374 real-time clock chips.
@@ -27,7 +26,7 @@ config SENSORS_DS1374
 
 config SENSORS_EEPROM
 	tristate "EEPROM reader"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get read-only access to the EEPROM data
 	  available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -38,7 +37,7 @@ config SENSORS_EEPROM
 
 config SENSORS_PCF8574
 	tristate "Philips PCF8574 and PCF8574A"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default n
 	help
 	  If you say yes here you get support for Philips PCF8574 and 
@@ -52,7 +51,7 @@ config SENSORS_PCF8574
 
 config SENSORS_PCA9539
 	tristate "Philips PCA9539 16-bit I/O port"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Philips PCA9539
 	  16-bit I/O port.
@@ -62,7 +61,7 @@ config SENSORS_PCA9539
 
 config SENSORS_PCF8591
 	tristate "Philips PCF8591"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default n
 	help
 	  If you say yes here you get support for Philips PCF8591 chips.
@@ -75,7 +74,7 @@ config SENSORS_PCF8591
 
 config ISP1301_OMAP
 	tristate "Philips ISP1301 with OMAP OTG"
-	depends on I2C && ARCH_OMAP_OTG
+	depends on ARCH_OMAP_OTG
 	help
 	  If you say yes here you get support for the Philips ISP1301
 	  USB-On-The-Go transceiver working with the OMAP OTG controller.
@@ -90,7 +89,7 @@ config ISP1301_OMAP
 # and having mostly OMAP-specific board support
 config TPS65010
 	tristate "TPS6501x Power Management chips"
-	depends on I2C && ARCH_OMAP
+	depends on ARCH_OMAP
 	default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
 	help
 	  If you say yes here you get support for the TPS6501x series of
@@ -103,7 +102,7 @@ config TPS65010
 
 config SENSORS_M41T00
 	tristate "ST M41T00 RTC chip"
-	depends on I2C && PPC32
+	depends on PPC32
 	help
 	  If you say yes here you get support for the ST M41T00 RTC chip.
 
@@ -112,7 +111,7 @@ config SENSORS_M41T00
 
 config SENSORS_MAX6875
 	tristate "Maxim MAX6875 Power supply supervisor"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Maxim MAX6875
 	  EEPROM-programmable, quad power-supply sequencer/supervisor.
#<EOF>

[PATCH 11/30] Use menuconfig objects - I2O

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/message/i2o/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/message/i2o/Kconfig
+++ linux-2.6.21-rc5/drivers/message/i2o/Kconfig
@@ -1,8 +1,6 @@
 
-menu "I2O device support"
-
-config I2O
-	tristate "I2O support"
+menuconfig I2O
+	tristate "I2O device support"
 	depends on PCI
 	---help---
 	  The Intelligent Input/Output (I2O) architecture allows hardware
@@ -24,9 +22,10 @@ config I2O
 
 	  If unsure, say N.
 
+if I2O
+
 config I2O_LCT_NOTIFY_ON_CHANGES
 	bool "Enable LCT notification"
-	depends on I2O
 	default y
 	---help---
 	  Only say N here if you have a I2O controller from SUN. The SUN
@@ -38,7 +37,6 @@ config I2O_LCT_NOTIFY_ON_CHANGES
 
 config I2O_EXT_ADAPTEC
 	bool "Enable Adaptec extensions"
-	depends on I2O
 	default y
 	---help---
 	  Say Y for support of raidutils for Adaptec I2O controllers. You also
@@ -56,7 +54,6 @@ config I2O_EXT_ADAPTEC_DMA64
 
 config I2O_CONFIG
 	tristate "I2O Configuration support"
-	depends on I2O
 	---help---
 	  Say Y for support of the configuration interface for the I2O adapters.
 	  If you have a RAID controller from Adaptec and you want to use the
@@ -77,7 +74,6 @@ config I2O_CONFIG_OLD_IOCTL
 
 config I2O_BUS
 	tristate "I2O Bus Adapter OSM"
-	depends on I2O
 	---help---
 	  Include support for the I2O Bus Adapter OSM. The Bus Adapter OSM
 	  provides access to the busses on the I2O controller. The main purpose
@@ -88,7 +84,7 @@ config I2O_BUS
 
 config I2O_BLOCK
 	tristate "I2O Block OSM"
-	depends on I2O && BLOCK
+	depends on BLOCK
 	---help---
 	  Include support for the I2O Block OSM. The Block OSM presents disk
 	  and other structured block devices to the operating system. If you
@@ -101,7 +97,7 @@ config I2O_BLOCK
 
 config I2O_SCSI
 	tristate "I2O SCSI OSM"
-	depends on I2O && SCSI
+	depends on SCSI
 	---help---
 	  Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
 	  I2O controller. You can use both the SCSI and Block OSM together if
@@ -113,7 +109,6 @@ config I2O_SCSI
 
 config I2O_PROC
 	tristate "I2O /proc support"
-	depends on I2O
 	---help---
 	  If you say Y here and to "/proc file system support", you will be
 	  able to read I2O related information from the virtual directory
@@ -122,5 +117,4 @@ config I2O_PROC
 	  To compile this support as a module, choose M here: the
 	  module will be called i2o_proc.
 
-endmenu
-
+endif # I2O
#<EOF>

[PATCH 12/30] Use menuconfig objects - IDE

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/ide/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/ide/Kconfig
+++ linux-2.6.21-rc5/drivers/ide/Kconfig
@@ -4,12 +4,9 @@
 # Andre Hedrick <andre@linux-ide.org>
 #
 
-if BLOCK
-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
+	depends on BLOCK
 	---help---
 	  If you say Y here, your kernel will be able to manage low cost mass
 	  storage units such as ATA/(E)IDE and ATAPI units. The most common
@@ -1081,8 +1078,4 @@ config BLK_DEV_HD_ONLY
 config BLK_DEV_HD
 	def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
 
-endif
-
-endmenu
-
-endif
+endif # IDE
#<EOF>

[PATCH 13/30] Use menuconfig objects - IEEE1394

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/ieee1394/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/ieee1394/Kconfig
+++ linux-2.6.21-rc5/drivers/ieee1394/Kconfig
@@ -1,8 +1,6 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support"
-
-config IEEE1394
+menuconfig IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
 	depends on PCI || BROKEN
 	select NET
@@ -19,12 +17,12 @@ config IEEE1394
 	  To compile this driver as a module, say M here: the
 	  module will be called ieee1394.
 
+if IEEE1394
+
 comment "Subsystem Options"
-	depends on IEEE1394
 
 config IEEE1394_VERBOSEDEBUG
 	bool "Excessive debugging output"
-	depends on IEEE1394
 	help
 	  If you say Y here, you will get very verbose debugging logs from
 	  the subsystem which includes a dump of the header of every sent
@@ -37,7 +35,6 @@ config IEEE1394_VERBOSEDEBUG
 
 config IEEE1394_EXTRA_CONFIG_ROMS
 	bool "Build in extra config rom entries for certain functionality"
-	depends on IEEE1394
 	help
 	  Some IEEE1394 functionality depends on extra config rom entries
 	  being available in the host adapters CSR. These options will
@@ -45,7 +42,7 @@ config IEEE1394_EXTRA_CONFIG_ROMS
 
 config IEEE1394_CONFIG_ROM_IP1394
 	bool "IP-1394 Entry"
-	depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394
+	depends on IEEE1394_EXTRA_CONFIG_ROMS
 	help
 	  Adds an entry for using IP-over-1394. If you want to use your
 	  IEEE1394 bus as a network for IP systems (including interacting
@@ -53,14 +50,13 @@ config IEEE1394_CONFIG_ROM_IP1394
 	  eth1394 option below.
 
 comment "Device Drivers"
-	depends on IEEE1394
 
 comment "Texas Instruments PCILynx requires I2C"
-	depends on IEEE1394 && I2C=n
+	depends on I2C=n
 
 config IEEE1394_PCILYNX
 	tristate "Texas Instruments PCILynx support"
-	depends on PCI && IEEE1394 && I2C
+	depends on PCI && I2C
 	select I2C_ALGOBIT
 	help
 	  Say Y here if you have an IEEE-1394 controller with the Texas
@@ -72,7 +68,7 @@ config IEEE1394_PCILYNX
 
 config IEEE1394_OHCI1394
 	tristate "OHCI-1394 support"
-	depends on PCI && IEEE1394
+	depends on PCI
 	help
 	  Enable this driver if you have an IEEE 1394 controller based on the
 	  OHCI-1394 specification. The current driver is only tested with OHCI
@@ -84,22 +80,21 @@ config IEEE1394_OHCI1394
 	  module will be called ohci1394.
 
 comment "Protocol Drivers"
-	depends on IEEE1394
 
 config IEEE1394_VIDEO1394
 	tristate "OHCI-1394 Video support"
-	depends on IEEE1394 && IEEE1394_OHCI1394
+	depends on IEEE1394_OHCI1394
 	help
 	  This option enables video device usage for OHCI-1394 cards.  Enable
 	  this option only if you have an IEEE 1394 video device connected to
 	  an OHCI-1394 card.
 
 comment "SBP-2 support (for storage devices) requires SCSI"
-	depends on IEEE1394 && SCSI=n
+	depends on SCSI=n
 
 config IEEE1394_SBP2
 	tristate "SBP-2 support (Harddisks etc.)"
-	depends on IEEE1394 && SCSI
+	depends on SCSI
 	help
 	  This option enables you to use SBP-2 devices connected to an IEEE
 	  1394 bus.  SBP-2 devices include storage devices like harddisks and
@@ -110,7 +105,7 @@ config IEEE1394_SBP2
 
 config IEEE1394_SBP2_PHYS_DMA
 	bool "Enable replacement for physical DMA in SBP2"
-	depends on IEEE1394 && IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)
+	depends on IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)
 	help
 	  This builds sbp2 for use with non-OHCI host adapters which do not
 	  support physical DMA or for when ohci1394 is run with phys_dma=0.
@@ -123,7 +118,7 @@ config IEEE1394_SBP2_PHYS_DMA
 
 config IEEE1394_ETH1394
 	tristate "Ethernet over 1394"
-	depends on IEEE1394 && EXPERIMENTAL && INET
+	depends on EXPERIMENTAL && INET
 	select IEEE1394_CONFIG_ROM_IP1394
 	select IEEE1394_EXTRA_CONFIG_ROMS
 	help
@@ -136,7 +131,7 @@ config IEEE1394_ETH1394
 
 config IEEE1394_DV1394
 	tristate "OHCI-DV I/O support (deprecated)"
-	depends on IEEE1394 && IEEE1394_OHCI1394
+	depends on IEEE1394_OHCI1394
 	help
 	  The dv1394 driver will be removed from Linux in a future release.
 	  Its functionality is now provided by raw1394 together with libraries
@@ -144,7 +139,6 @@ config IEEE1394_DV1394
 
 config IEEE1394_RAWIO
 	tristate "Raw IEEE1394 I/O support"
-	depends on IEEE1394
 	help
 	  Say Y here if you want support for the raw device. This is generally
 	  a good idea, so you should say Y here. The raw device enables
@@ -154,4 +148,4 @@ config IEEE1394_RAWIO
 	  To compile this driver as a module, say M here: the
 	  module will be called raw1394.
 
-endmenu
+endif # IEEE1394
#<EOF>

[PATCH 14/30] Use menuconfig objects - MD

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/md/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/md/Kconfig
+++ linux-2.6.21-rc5/drivers/md/Kconfig
@@ -2,19 +2,17 @@
 # Block device driver configuration
 #
 
-if BLOCK
-
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
+	depends on BLOCK
 	help
 	  Support multiple physical spindles through a single logical device.
 	  Required for RAID and logical volume management.
 
+if MD
+
 config BLK_DEV_MD
 	tristate "RAID support"
-	depends on MD
 	---help---
 	  This driver lets you combine several hard disk partitions into one
 	  logical block device. This can be used to simply append one
@@ -189,7 +187,6 @@ config MD_FAULTY
 
 config BLK_DEV_DM
 	tristate "Device mapper support"
-	depends on MD
 	---help---
 	  Device-mapper is a low level volume manager.  It works by allowing
 	  people to specify mappings for ranges of logical sectors.  Various
@@ -262,6 +259,4 @@ config DM_MULTIPATH_EMC
 	---help---
 	  Multipath support for EMC CX/AX series hardware.
 
-endmenu
-
-endif
+endif # MD
#<EOF>

[PATCH 15/30] Use menuconfig objects - module menu

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

This one also touches the block menu, so needs to go handinhand with 
[PATCH 04/30] Use meunconfig objects - block. (I just noticed now - 
sorry)

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/init/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/init/Kconfig
+++ linux-2.6.21-rc5/init/Kconfig
@@ -511,9 +511,7 @@ config SLOB
 	default !SLAB
 	bool
 
-menu "Loadable module support"
-
-config MODULES
+menuconfig MODULES
 	bool "Enable loadable module support"
 	help
 	  Kernel modules are small pieces of compiled code which can
@@ -593,8 +591,5 @@ config STOP_MACHINE
 	depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
 	help
 	  Need stop_machine() primitive.
-endmenu
 
-menu "Block layer"
 source "block/Kconfig"
-endmenu
#<EOF>

[PATCH 16/30] Use menuconfig objects - MTD

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/Kconfig
@@ -1,8 +1,6 @@
 # $Id: Kconfig,v 1.11 2005/11/07 11:14:19 gleixner Exp $
 
-menu "Memory Technology Devices (MTD)"
-
-config MTD
+menuconfig MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
 	  Memory Technology Devices are flash, RAM and similar chips, often
@@ -13,9 +11,10 @@ config MTD
 	  them. It will also allow you to select individual drivers for
 	  particular hardware and users of MTD devices. If unsure, say N.
 
+if MTD
+
 config MTD_DEBUG
 	bool "Debugging"
-	depends on MTD
 	help
 	  This turns on low-level debugging for the entire MTD sub-system.
 	  Normally, you should say 'N'.
@@ -29,7 +28,6 @@ config MTD_DEBUG_VERBOSE
 
 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)
@@ -38,7 +36,6 @@ config MTD_CONCAT
 
 config MTD_PARTITIONS
 	bool "MTD partitioning support"
-	depends on MTD
 	help
 	  If you have a device which needs to divide its flash chip(s) up
 	  into multiple 'partitions', each of which appears to the user as
@@ -153,11 +150,9 @@ config MTD_AFS_PARTS
 	  'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
 
 comment "User Modules And Translation Layers"
-	depends on MTD
 
 config MTD_CHAR
 	tristate "Direct char device access to MTD devices"
-	depends on MTD
 	help
 	  This provides a character device for each MTD device present in
 	  the system, allowing the user to read and write directly to the
@@ -166,12 +161,12 @@ config MTD_CHAR
 
 config MTD_BLKDEVS
 	tristate "Common interface to block layer for MTD 'translation layers'"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	default n
 
 config MTD_BLOCK
 	tristate "Caching block device access to MTD devices"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	---help---
 	  Although most flash chips have an erase size too large to be useful
@@ -194,7 +189,7 @@ config MTD_BLOCK
 
 config MTD_BLOCK_RO
 	tristate "Readonly block device access to MTD devices"
-	depends on MTD_BLOCK!=y && MTD && BLOCK
+	depends on MTD_BLOCK!=y && BLOCK
 	select MTD_BLKDEVS
 	help
 	  This allows you to mount read-only file systems (such as cramfs)
@@ -206,7 +201,7 @@ config MTD_BLOCK_RO
 
 config FTL
 	tristate "FTL (Flash Translation Layer) support"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	---help---
 	  This provides support for the original Flash Translation Layer which
@@ -223,7 +218,7 @@ config FTL
 
 config NFTL
 	tristate "NFTL (NAND Flash Translation Layer) support"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	---help---
 	  This provides support for the NAND Flash Translation Layer which is
@@ -247,7 +242,7 @@ config NFTL_RW
 
 config INFTL
 	tristate "INFTL (Inverse NAND Flash Translation Layer) support"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	---help---
 	  This provides support for the Inverse NAND Flash Translation
@@ -265,7 +260,7 @@ config INFTL
 
 config RFD_FTL
         tristate "Resident Flash Disk (Flash Translation Layer) support"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	---help---
 	  This provides support for the flash translation layer known
@@ -276,7 +271,7 @@ config RFD_FTL
 
 config SSFDC
 	tristate "NAND SSFDC (SmartMedia) read only translation layer"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	select MTD_BLKDEVS
 	help
 	  This enables read only access to SmartMedia formatted NAND
@@ -292,5 +287,4 @@ source "drivers/mtd/nand/Kconfig"
 
 source "drivers/mtd/onenand/Kconfig"
 
-endmenu
-
+endif # MTD
Index: linux-2.6.21-rc5/drivers/mtd/chips/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/chips/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/chips/Kconfig
@@ -6,7 +6,6 @@ menu "RAM/ROM/Flash chip drivers"
 
 config MTD_CFI
 	tristate "Detect flash chips by Common Flash Interface (CFI) probe"
-	depends on MTD
 	select MTD_GEN_PROBE
 	help
 	  The Common Flash Interface specification was developed by Intel,
@@ -18,7 +17,6 @@ config MTD_CFI
 
 config MTD_JEDECPROBE
 	tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
-	depends on MTD
 	select MTD_GEN_PROBE
 	help
 	  This option enables JEDEC-style probing of flash chips which are not
@@ -213,21 +211,18 @@ config MTD_CFI_UTIL
 
 config MTD_RAM
 	tristate "Support for RAM chips in bus mapping"
-	depends on MTD
 	help
 	  This option enables basic support for RAM chips accessed through
 	  a bus mapping driver.
 
 config MTD_ROM
 	tristate "Support for ROM chips in bus mapping"
-	depends on MTD
 	help
 	  This option enables basic support for ROM chips accessed through
 	  a bus mapping driver.
 
 config MTD_ABSENT
 	tristate "Support for absent chips in bus mapping"
-	depends on MTD
 	help
 	  This option enables support for a dummy probing driver used to
 	  allocated placeholder MTD devices on systems that have socketed
@@ -237,7 +232,6 @@ config MTD_ABSENT
 	  with this driver will return -ENODEV upon access.
 
 config MTD_OBSOLETE_CHIPS
-	depends on MTD
 	bool "Older (theoretically obsoleted now) drivers for non-CFI chips"
 	help
 	  This option does not enable any code directly, but will allow you to
@@ -250,7 +244,7 @@ config MTD_OBSOLETE_CHIPS
 
 config MTD_AMDSTD
 	tristate "AMD compatible flash chip support (non-CFI)"
-	depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
+	depends on MTD_OBSOLETE_CHIPS && BROKEN
 	help
 	  This option enables support for flash chips using AMD-compatible
 	  commands, including some which are not CFI-compatible and hence
@@ -260,7 +254,7 @@ config MTD_AMDSTD
 
 config MTD_SHARP
 	tristate "pre-CFI Sharp chip support"
-	depends on MTD && MTD_OBSOLETE_CHIPS
+	depends on MTD_OBSOLETE_CHIPS
 	help
 	  This option enables support for flash chips using Sharp-compatible
 	  commands, including some which are not CFI-compatible and hence
@@ -268,7 +262,7 @@ config MTD_SHARP
 
 config MTD_JEDEC
 	tristate "JEDEC device support"
-	depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
+	depends on MTD_OBSOLETE_CHIPS && BROKEN
 	help
 	  Enable older JEDEC flash interface devices for self
 	  programming flash.  It is commonly used in older AMD chips.  It is
Index: linux-2.6.21-rc5/drivers/mtd/devices/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/devices/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/devices/Kconfig
@@ -6,7 +6,7 @@ menu "Self-contained MTD device drivers"
 
 config MTD_PMC551
 	tristate "Ramix PMC551 PCI Mezzanine RAM card support"
-	depends on MTD && PCI
+	depends on PCI
 	---help---
 	  This provides a MTD device driver for the Ramix PMC551 RAM PCI card
 	  from Ramix Inc. <http://www.ramix.com/products/memory/pmc551.html>.
@@ -40,7 +40,7 @@ config MTD_PMC551_DEBUG
 
 config MTD_MS02NV
 	tristate "DEC MS02-NV NVRAM module support"
-	depends on MTD && MACH_DECSTATION
+	depends on MACH_DECSTATION
 	help
 	  This is an MTD driver for the DEC's MS02-NV (54-20948-01) battery
 	  backed-up NVRAM module.  The module was originally meant as an NFS
@@ -54,7 +54,7 @@ config MTD_MS02NV
 
 config MTD_DATAFLASH
 	tristate "Support for AT45xxx DataFlash"
-	depends on MTD && SPI_MASTER && EXPERIMENTAL
+	depends on SPI_MASTER && EXPERIMENTAL
 	help
 	  This enables access to AT45xxx DataFlash chips, using SPI.
 	  Sometimes DataFlash chips are packaged inside MMC-format
@@ -62,7 +62,7 @@ config MTD_DATAFLASH
 
 config MTD_M25P80
 	tristate "Support for M25 SPI Flash"
-	depends on MTD && SPI_MASTER && EXPERIMENTAL
+	depends on SPI_MASTER && EXPERIMENTAL
 	help
 	  This enables access to ST M25P80 and similar SPI flash chips,
 	  used for program and data storage.  Set up your spi devices
@@ -70,7 +70,6 @@ config MTD_M25P80
 
 config MTD_SLRAM
 	tristate "Uncached system RAM"
-	depends on MTD
 	help
 	  If your CPU cannot cache all of the physical memory in your machine,
 	  you can still use it for storage or swap by using this driver to
@@ -78,7 +77,6 @@ config MTD_SLRAM
 
 config MTD_PHRAM
 	tristate "Physical system RAM"
-	depends on MTD
 	help
 	  This is a re-implementation of the slram driver above.
 
@@ -88,7 +86,7 @@ config MTD_PHRAM
 
 config MTD_LART
 	tristate "28F160xx flash driver for LART"
-	depends on SA1100_LART && MTD
+	depends on SA1100_LART
 	help
 	  This enables the flash driver for LART. Please note that you do
 	  not need any mapping/chip driver for LART. This one does it all
@@ -96,7 +94,6 @@ config MTD_LART
 
 config MTD_MTDRAM
 	tristate "Test driver using RAM"
-	depends on MTD
 	help
 	  This enables a test MTD device driver which uses vmalloc() to
 	  provide storage.  You probably want to say 'N' unless you're
@@ -136,7 +133,7 @@ config MTDRAM_ABS_POS
 
 config MTD_BLOCK2MTD
 	tristate "MTD using block device"
-	depends on MTD && BLOCK
+	depends on BLOCK
 	help
 	  This driver allows a block device to appear as an MTD. It would
 	  generally be used in the following cases:
@@ -150,7 +147,6 @@ comment "Disk-On-Chip Device Drivers"
 
 config MTD_DOC2000
 	tristate "M-Systems Disk-On-Chip 2000 and Millennium (DEPRECATED)"
-	depends on MTD
 	select MTD_DOCPROBE
 	select MTD_NAND_IDS
 	---help---
@@ -173,7 +169,6 @@ config MTD_DOC2000
 
 config MTD_DOC2001
 	tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECATED)"
-	depends on MTD
 	select MTD_DOCPROBE
 	select MTD_NAND_IDS
 	---help---
@@ -195,7 +190,6 @@ config MTD_DOC2001
 
 config MTD_DOC2001PLUS
 	tristate "M-Systems Disk-On-Chip Millennium Plus"
-	depends on MTD
 	select MTD_DOCPROBE
 	select MTD_NAND_IDS
 	---help---
Index: linux-2.6.21-rc5/drivers/mtd/maps/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/maps/Kconfig
@@ -6,7 +6,6 @@ menu "Mapping drivers for chip access"
 
 config MTD_COMPLEX_MAPPINGS
 	bool "Support non-linear mappings of flash chips"
-	depends on MTD
 	help
 	  This causes the chip drivers to allow for complicated
 	  paged mappings of flash chips.
@@ -517,7 +516,7 @@ config MTD_OMAP_NOR
 # This needs CFI or JEDEC, depending on the cards found.
 config MTD_PCI
 	tristate "PCI MTD driver"
-	depends on MTD && PCI && MTD_COMPLEX_MAPPINGS
+	depends on PCI && MTD_COMPLEX_MAPPINGS
 	help
 	  Mapping for accessing flash devices on add-in cards like the Intel XScale
 	  IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode
@@ -527,7 +526,7 @@ config MTD_PCI
 
 config MTD_PCMCIA
 	tristate "PCMCIA MTD driver"
-	depends on MTD && PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
+	depends on PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
 	help
 	  Map driver for accessing PCMCIA linear flash memory cards. These
 	  cards are usually around 4-16MiB in size. This does not include
@@ -591,13 +590,12 @@ config MTD_BAST_MAXSIZE
 
 config MTD_SHARP_SL
 	bool "ROM mapped on Sharp SL Series"
-	depends on MTD && ARCH_PXA
+	depends on ARCH_PXA
 	help
 	  This enables access to the flash chip on the Sharp SL Series of PDAs.
 
 config MTD_PLATRAM
 	tristate "Map driver for platform device RAM (mtd-ram)"
-	depends on MTD
 	select MTD_RAM
 	help
 	  Map driver for RAM areas described via the platform device
Index: linux-2.6.21-rc5/drivers/mtd/nand/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/nand/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/nand/Kconfig
@@ -1,10 +1,7 @@
 # drivers/mtd/nand/Kconfig
 # $Id: Kconfig,v 1.35 2005/11/07 11:14:30 gleixner Exp $
 
-menu "NAND Flash Device Drivers"
-	depends on MTD!=n
-
-config MTD_NAND
+menuconfig MTD_NAND
 	tristate "NAND Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
@@ -13,9 +10,10 @@ config MTD_NAND
 	  devices. For further information see
 	  <http://www.linux-mtd.infradead.org/doc/nand.html>.
 
+if MTD_NAND
+
 config MTD_NAND_VERIFY_WRITE
 	bool "Verify NAND page writes"
-	depends on MTD_NAND
 	help
 	  This adds an extra check when data is written to the flash. The
 	  NAND flash device internally checks only bits transitioning
@@ -25,7 +23,6 @@ config MTD_NAND_VERIFY_WRITE
 
 config MTD_NAND_ECC_SMC
 	bool "NAND ECC Smart Media byte order"
-	depends on MTD_NAND
 	default n
 	help
 	  Software ECC according to the Smart Media Specification.
@@ -33,45 +30,45 @@ config MTD_NAND_ECC_SMC
 
 config MTD_NAND_AUTCPU12
 	tristate "SmartMediaCard on autronix autcpu12 board"
-	depends on MTD_NAND && ARCH_AUTCPU12
+	depends on ARCH_AUTCPU12
 	help
 	  This enables the driver for the autronix autcpu12 board to
 	  access the SmartMediaCard.
 
 config MTD_NAND_EDB7312
 	tristate "Support for Cirrus Logic EBD7312 evaluation board"
-	depends on MTD_NAND && ARCH_EDB7312
+	depends on ARCH_EDB7312
 	help
 	  This enables the driver for the Cirrus Logic EBD7312 evaluation
 	  board to access the onboard NAND Flash.
 
 config MTD_NAND_H1900
 	tristate "iPAQ H1900 flash"
-	depends on MTD_NAND && ARCH_PXA && MTD_PARTITIONS
+	depends on ARCH_PXA && MTD_PARTITIONS
 	help
 	  This enables the driver for the iPAQ h1900 flash.
 
 config MTD_NAND_SPIA
 	tristate "NAND Flash device on SPIA board"
-	depends on ARCH_P720T && MTD_NAND
+	depends on ARCH_P720T
 	help
 	  If you had to ask, you don't have one. Say 'N'.
 
 config MTD_NAND_AMS_DELTA
 	tristate "NAND Flash device on Amstrad E3"
-	depends on MACH_AMS_DELTA && MTD_NAND
+	depends on MACH_AMS_DELTA
 	help
 	  Support for NAND flash on Amstrad E3 (Delta).
 
 config MTD_NAND_TOTO
 	tristate "NAND Flash device on TOTO board"
-	depends on ARCH_OMAP && MTD_NAND && BROKEN
+	depends on ARCH_OMAP && BROKEN
 	help
 	  Support for NAND flash on Texas Instruments Toto platform.
 
 config MTD_NAND_TS7250
 	tristate "NAND Flash device on TS-7250 board"
-	depends on MACH_TS72XX && MTD_NAND
+	depends on MACH_TS72XX
 	help
 	  Support for NAND flash on Technologic Systems TS-7250 platform.
 
@@ -80,14 +77,14 @@ config MTD_NAND_IDS
 
 config MTD_NAND_AU1550
 	tristate "Au1550/1200 NAND support"
-	depends on (SOC_AU1200 || SOC_AU1550) && MTD_NAND
+	depends on SOC_AU1200 || SOC_AU1550
 	help
 	  This enables the driver for the NAND flash controller on the
 	  AMD/Alchemy 1550 SOC.
 
 config MTD_NAND_RTC_FROM4
 	tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"
-	depends on MTD_NAND && SH_SOLUTION_ENGINE
+	depends on SH_SOLUTION_ENGINE
 	select REED_SOLOMON
 	select REED_SOLOMON_DEC8
 	select BITREVERSE
@@ -97,13 +94,13 @@ config MTD_NAND_RTC_FROM4
 
 config MTD_NAND_PPCHAMELEONEVB
 	tristate "NAND Flash device on PPChameleonEVB board"
-	depends on PPCHAMELEONEVB && MTD_NAND && BROKEN
+	depends on PPCHAMELEONEVB && BROKEN
 	help
 	  This enables the NAND flash driver on the PPChameleon EVB Board.
 
 config MTD_NAND_S3C2410
 	tristate "NAND Flash support for S3C2410/S3C2440 SoC"
-	depends on ARCH_S3C2410 && MTD_NAND
+	depends on ARCH_S3C2410
 	help
 	  This enables the NAND flash controller on the S3C2410 and S3C2440
 	  SoCs
@@ -128,7 +125,7 @@ config MTD_NAND_S3C2410_HWECC
 
 config MTD_NAND_NDFC
 	tristate "NDFC NanD Flash Controller"
-	depends on MTD_NAND && 44x
+	depends on 44x
 	select MTD_NAND_ECC_SMC
 	help
 	 NDFC Nand Flash Controllers are integrated in EP44x SoCs
@@ -145,7 +142,7 @@ config MTD_NAND_S3C2410_CLKSTOP
 
 config MTD_NAND_DISKONCHIP
 	tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
-	depends on MTD_NAND && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	select REED_SOLOMON
 	select REED_SOLOMON_DEC16
 	help
@@ -215,11 +212,11 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
 
 config MTD_NAND_SHARPSL
 	tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
-	depends on MTD_NAND && ARCH_PXA
+	depends on ARCH_PXA
 
 config MTD_NAND_BASLER_EXCITE
 	tristate  "Support for NAND Flash on Basler eXcite"
-	depends on MTD_NAND && BASLER_EXCITE
+	depends on BASLER_EXCITE
 	help
           This enables the driver for the NAND flash device found on the
           Basler eXcite Smart Camera. If built as a module, the driver
@@ -227,14 +224,14 @@ config MTD_NAND_BASLER_EXCITE
 
 config MTD_NAND_CAFE
        tristate "NAND support for OLPC CAFÉ chip"
-       depends on MTD_NAND && PCI
+       depends on PCI
        help
 	 Use NAND flash attached to the CAFÉ chip designed for the $100
 	 laptop.
 
 config MTD_NAND_CS553X
 	tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
-	depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)
+	depends on X86_32 && (X86_PC || X86_GENERICARCH)
 	help
 	  The CS553x companion chips for the AMD Geode processor
 	  include NAND flash controllers with built-in hardware ECC
@@ -247,16 +244,16 @@ config MTD_NAND_CS553X
 
 config MTD_NAND_AT91
 	bool "Support for NAND Flash / SmartMedia on AT91"
-	depends on MTD_NAND && ARCH_AT91
+	depends on ARCH_AT91
 	help
 	  Enables support for NAND Flash / Smart Media Card interface
 	  on Atmel AT91 processors.
 
 config MTD_NAND_NANDSIM
 	tristate "Support for NAND Flash Simulator"
-	depends on MTD_NAND && MTD_PARTITIONS
+	depends on MTD_PARTITIONS
 	help
 	  The simulator may simulate various NAND flash chips for the
 	  MTD nand layer.
 
-endmenu
+endif # MTD_NAND
Index: linux-2.6.21-rc5/drivers/mtd/onenand/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/mtd/onenand/Kconfig
+++ linux-2.6.21-rc5/drivers/mtd/onenand/Kconfig
@@ -2,10 +2,7 @@
 # linux/drivers/mtd/onenand/Kconfig
 #
 
-menu "OneNAND Flash Device Drivers"
-	depends on MTD != n
-
-config MTD_ONENAND
+menuconfig MTD_ONENAND
 	tristate "OneNAND Device Support"
 	depends on MTD
 	help
@@ -13,9 +10,10 @@ config MTD_ONENAND
 	  devices. For further information see
 	  <http://www.samsung.com/Products/Semiconductor/Flash/OneNAND_TM/index.htm>.
 
+if MTD_ONENAND
+
 config MTD_ONENAND_VERIFY_WRITE
 	bool "Verify OneNAND page writes"
-	depends on MTD_ONENAND
 	help
 	  This adds an extra check when data is written to the flash. The
 	  OneNAND flash device internally checks only bits transitioning
@@ -25,13 +23,12 @@ config MTD_ONENAND_VERIFY_WRITE
 
 config MTD_ONENAND_GENERIC
 	tristate "OneNAND Flash device via platform device driver"
-	depends on MTD_ONENAND && ARM
+	depends on ARM
 	help
 	  Support for OneNAND flash via platform device driver.
 
 config MTD_ONENAND_OTP
 	bool "OneNAND OTP Support"
-	depends on MTD_ONENAND
 	help
 	  One Block of the NAND Flash Array memory is reserved as
 	  a One-Time Programmable Block memory area.
@@ -43,4 +40,4 @@ config MTD_ONENAND_OTP
 
 	  OTP block is fully-guaranteed to be a valid block.
 
-endmenu
+endif # MTD_ONENAND
#<EOF>

[PATCH 17/30] Use menuconfig objects - IPVS

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/ipv4/ipvs/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/net/ipv4/ipvs/Kconfig
+++ linux-2.6.21-rc5/net/ipv4/ipvs/Kconfig
@@ -1,10 +1,7 @@
 #
 # IP Virtual Server configuration
 #
-menu	"IP: Virtual Server Configuration"
-	depends on NETFILTER
-
-config	IP_VS
+menuconfig IP_VS
 	tristate "IP virtual server support (EXPERIMENTAL)"
 	depends on NETFILTER
 	---help---
@@ -25,9 +22,10 @@ config	IP_VS
 	  If you want to compile it in kernel, say Y. To compile it as a
 	  module, choose M here. If unsure, say N.
 
+if IP_VS
+
 config	IP_VS_DEBUG
 	bool "IP virtual server debugging"
-	depends on IP_VS
 	---help---
 	  Say Y here if you want to get additional messages useful in
 	  debugging the IP virtual server code. You can change the debug
@@ -35,7 +33,6 @@ config	IP_VS_DEBUG
 
 config	IP_VS_TAB_BITS
 	int "IPVS connection table size (the Nth power of 2)"
-	depends on IP_VS 
 	default "12" 
 	---help---
 	  The IPVS connection hash table uses the chaining scheme to handle
@@ -61,42 +58,35 @@ config	IP_VS_TAB_BITS
 	  needed for your box.
 
 comment "IPVS transport protocol load balancing support"
-        depends on IP_VS
 
 config	IP_VS_PROTO_TCP
 	bool "TCP load balancing support"
-	depends on IP_VS
 	---help---
 	  This option enables support for load balancing TCP transport
 	  protocol. Say Y if unsure.
 
 config	IP_VS_PROTO_UDP
 	bool "UDP load balancing support"
-	depends on IP_VS
 	---help---
 	  This option enables support for load balancing UDP transport
 	  protocol. Say Y if unsure.
 
 config	IP_VS_PROTO_ESP
 	bool "ESP load balancing support"
-	depends on IP_VS
 	---help---
 	  This option enables support for load balancing ESP (Encapsulation
 	  Security Payload) transport protocol. Say Y if unsure.
 
 config	IP_VS_PROTO_AH
 	bool "AH load balancing support"
-	depends on IP_VS
 	---help---
 	  This option enables support for load balancing AH (Authentication
 	  Header) transport protocol. Say Y if unsure.
 
 comment "IPVS scheduler"
-        depends on IP_VS
 
 config	IP_VS_RR
 	tristate "round-robin scheduling"
-	depends on IP_VS
 	---help---
 	  The robin-robin scheduling algorithm simply directs network
 	  connections to different real servers in a round-robin manner.
@@ -106,7 +96,6 @@ config	IP_VS_RR
  
 config	IP_VS_WRR
         tristate "weighted round-robin scheduling" 
-	depends on IP_VS
 	---help---
 	  The weighted robin-robin scheduling algorithm directs network
 	  connections to different real servers based on server weights
@@ -120,7 +109,6 @@ config	IP_VS_WRR
 
 config	IP_VS_LC
         tristate "least-connection scheduling"
-        depends on IP_VS
 	---help---
 	  The least-connection scheduling algorithm directs network
 	  connections to the server with the least number of active 
@@ -131,7 +119,6 @@ config	IP_VS_LC
 
 config	IP_VS_WLC
         tristate "weighted least-connection scheduling"
-        depends on IP_VS
 	---help---
 	  The weighted least-connection scheduling algorithm directs network
 	  connections to the server with the least active connections
@@ -142,7 +129,6 @@ config	IP_VS_WLC
 
 config	IP_VS_LBLC
 	tristate "locality-based least-connection scheduling"
-        depends on IP_VS
 	---help---
 	  The locality-based least-connection scheduling algorithm is for
 	  destination IP load balancing. It is usually used in cache cluster.
@@ -157,7 +143,6 @@ config	IP_VS_LBLC
 
 config  IP_VS_LBLCR
 	tristate "locality-based least-connection with replication scheduling"
-        depends on IP_VS
 	---help---
 	  The locality-based least-connection with replication scheduling
 	  algorithm is also for destination IP load balancing. It is 
@@ -176,7 +161,6 @@ config  IP_VS_LBLCR
 
 config	IP_VS_DH
 	tristate "destination hashing scheduling"
-        depends on IP_VS
 	---help---
 	  The destination hashing scheduling algorithm assigns network
 	  connections to the servers through looking up a statically assigned
@@ -187,7 +171,6 @@ config	IP_VS_DH
 
 config	IP_VS_SH
 	tristate "source hashing scheduling"
-        depends on IP_VS
 	---help---
 	  The source hashing scheduling algorithm assigns network
 	  connections to the servers through looking up a statically assigned
@@ -198,7 +181,6 @@ config	IP_VS_SH
 
 config	IP_VS_SED
 	tristate "shortest expected delay scheduling"
-        depends on IP_VS
 	---help---
 	  The shortest expected delay scheduling algorithm assigns network
 	  connections to the server with the shortest expected delay. The 
@@ -212,7 +194,6 @@ config	IP_VS_SED
 
 config	IP_VS_NQ
 	tristate "never queue scheduling"
-        depends on IP_VS
 	---help---
 	  The never queue scheduling algorithm adopts a two-speed model.
 	  When there is an idle server available, the job will be sent to
@@ -225,11 +206,10 @@ config	IP_VS_NQ
 	  module, choose M here. If unsure, say N.
 
 comment 'IPVS application helper'
-	depends on IP_VS
 
 config	IP_VS_FTP
   	tristate "FTP protocol helper"
-        depends on IP_VS && IP_VS_PROTO_TCP
+        depends on IP_VS_PROTO_TCP
 	---help---
 	  FTP is a protocol that transfers IP address and/or port number in
 	  the payload. In the virtual server via Network Address Translation,
@@ -241,4 +221,4 @@ config	IP_VS_FTP
 	  If you want to compile it in kernel, say Y. To compile it as a
 	  module, choose M here. If unsure, say N.
 
-endmenu
+endif # IP_VS
#<EOF>

[PATCH 18/30] Use menuconfig objects - SCTP

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/sctp/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/net/sctp/Kconfig
+++ linux-2.6.21-rc5/net/sctp/Kconfig
@@ -2,11 +2,9 @@
 # SCTP configuration
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
 	depends on IPV6 || IPV6=n
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -36,9 +34,10 @@ config IP_SCTP
 
 	  If in doubt, say N.
 
+if IP_SCTP
+
 config SCTP_DBG_MSG
 	bool "SCTP: Debug messages"
-	depends on IP_SCTP
 	help
 	  If you say Y, this will enable verbose debugging messages. 
 
@@ -47,7 +46,6 @@ config SCTP_DBG_MSG
 
 config SCTP_DBG_OBJCNT
 	bool "SCTP: Debug object counts"
-	depends on IP_SCTP
 	help
 	  If you say Y, this will enable debugging support for counting the 
 	  type of objects that are currently allocated.  This is useful for 
@@ -59,7 +57,6 @@ config SCTP_DBG_OBJCNT
 
 choice
 	prompt "SCTP: Cookie HMAC Algorithm"
-	depends on IP_SCTP
 	default SCTP_HMAC_MD5
 	help
 	  HMAC algorithm to be used during association initialization.  It
@@ -86,4 +83,5 @@ config SCTP_HMAC_MD5
 	  advised to use either HMAC-MD5 or HMAC-SHA1.
 
 endchoice
-endmenu
+
+endif # IP_SCTP
#<EOF>

[PATCH 19/30] Use menuconfig objects - TIPC

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/net/tipc/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/net/tipc/Kconfig
+++ linux-2.6.21-rc5/net/tipc/Kconfig
@@ -2,11 +2,9 @@
 # TIPC configuration
 #
 
-menu "TIPC Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
-config TIPC
+menuconfig TIPC
 	tristate "The TIPC Protocol (EXPERIMENTAL)"
+	depends on INET && EXPERIMENTAL
 	---help---
 	  The Transparent Inter Process Communication (TIPC) protocol is
 	  specially designed for intra cluster communication. This protocol
@@ -22,9 +20,10 @@ config TIPC
 
 	  If in doubt, say N.
 
+if TIPC
+
 config TIPC_ADVANCED
 	bool "TIPC: Advanced configuration"
-	depends on TIPC
 	default n
 	help
 	  Saying Y here will open some advanced configuration
@@ -33,7 +32,7 @@ config TIPC_ADVANCED
 
 config TIPC_ZONES
 	int "Maximum number of zones in network"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default "3"
 	help
 	 Max number of zones inside TIPC network. Max supported value 
@@ -44,7 +43,7 @@ config TIPC_ZONES
 
 config TIPC_CLUSTERS
 	int "Maximum number of clusters in a zone"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default "1"
 	help
           ***Only 1 (one cluster in a zone) is supported by current code.
@@ -59,7 +58,7 @@ config TIPC_CLUSTERS
 
 config TIPC_NODES
 	int "Maximum number of nodes in cluster"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default "255"
 	help
 	  Maximum number of nodes inside a TIPC cluster. Maximum 
@@ -70,7 +69,7 @@ config TIPC_NODES
 
 config TIPC_SLAVE_NODES
 	int "Maximum number of slave nodes in cluster"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default "0"
 	help
           ***This capability is not supported by current code.***
@@ -83,7 +82,7 @@ config TIPC_SLAVE_NODES
 
 config TIPC_PORTS
 	int "Maximum number of ports in a node"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default "8191"
 	help
 	  Maximum number of ports within a node. Maximum 
@@ -94,7 +93,7 @@ config TIPC_PORTS
 
 config TIPC_LOG
 	int "Size of log buffer"
-	depends on TIPC && TIPC_ADVANCED
+	depends on TIPC_ADVANCED
 	default 0
 	help
  	  Size (in bytes) of TIPC's internal log buffer, which records the
@@ -106,7 +105,6 @@ config TIPC_LOG
 
 config TIPC_DEBUG
 	bool "Enable debugging support"
-	depends on TIPC
 	default n
 	help
  	  This will enable debugging of TIPC.
@@ -114,4 +112,4 @@ config TIPC_DEBUG
 	  Only say Y here if you are having trouble with TIPC.  It will
 	  enable the display of detailed information about what is going on.
 
-endmenu
+endif # TIPC
#<EOF>

[PATCH 20/30] Use menuconfig objects - ARCNET

[Jan Engelhardt]

(Wow, not a single MODULE_AUTHOR line in drivers/net/arcnet/ ...)

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/net/arcnet/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/net/arcnet/Kconfig
+++ linux-2.6.21-rc5/drivers/net/arcnet/Kconfig
@@ -2,10 +2,8 @@
 # Arcnet configuration
 #
 
-menu "ARCnet devices"
+menuconfig ARCNET
 	depends on NETDEVICES && (ISA || PCI)
-
-config ARCNET
 	tristate "ARCnet support"
 	---help---
 	  If you have a network card of this type, say Y and check out the
@@ -25,9 +23,10 @@ config ARCNET
 	  <file:Documentation/networking/net-modules.txt>.  The module will
 	  be called arcnet.
 
+if ARCNET
+
 config ARCNET_1201
 	tristate "Enable standard ARCNet packet format (RFC 1201)"
-	depends on ARCNET
 	help
 	  This allows you to use RFC1201 with your ARCnet card via the virtual
 	  arc0 device.  You need to say Y here to communicate with
@@ -38,7 +37,6 @@ config ARCNET_1201
 
 config ARCNET_1051
 	tristate "Enable old ARCNet packet format (RFC 1051)"
-	depends on ARCNET
 	---help---
 	  This allows you to use RFC1051 with your ARCnet card via the virtual
 	  arc0s device. You only need arc0s if you want to talk to ARCnet
@@ -53,7 +51,6 @@ config ARCNET_1051
 
 config ARCNET_RAW
 	tristate "Enable raw mode packet interface"
-	depends on ARCNET
 	help
 	  ARCnet "raw mode" packet encapsulation, no soft headers.  Unlikely
 	  to work unless talking to a copy of the same Linux arcnet driver,
@@ -61,7 +58,6 @@ config ARCNET_RAW
 
 config ARCNET_CAP
 	tristate "Enable CAP mode packet interface"
-	depends on ARCNET
 	help
 	  ARCnet "cap mode" packet encapsulation. Used to get the hardware
           acknowledge back to userspace. After the initial protocol byte every
@@ -80,7 +76,6 @@ config ARCNET_CAP
 
 config ARCNET_COM90xx
 	tristate "ARCnet COM90xx (normal) chipset driver"
-	depends on ARCNET
 	help
 	  This is the chipset driver for the standard COM90xx cards. If you
 	  have always used the old ARCnet driver without knowing what type of
@@ -92,7 +87,6 @@ config ARCNET_COM90xx
 
 config ARCNET_COM90xxIO
 	tristate "ARCnet COM90xx (IO mapped) chipset driver"
-	depends on ARCNET
 	---help---
 	  This is the chipset driver for the COM90xx cards, using them in
 	  IO-mapped mode instead of memory-mapped mode. This is slower than
@@ -105,7 +99,6 @@ config ARCNET_COM90xxIO
 
 config ARCNET_RIM_I
 	tristate "ARCnet COM90xx (RIM I) chipset driver"
-	depends on ARCNET
 	---help---
 	  This is yet another chipset driver for the COM90xx cards, but this
 	  time only using memory-mapped mode, and no IO ports at all. This
@@ -118,7 +111,6 @@ config ARCNET_RIM_I
 
 config ARCNET_COM20020
 	tristate "ARCnet COM20020 chipset driver"
-	depends on ARCNET
 	help
 	  This is the driver for the new COM20020 chipset. It supports such
 	  things as promiscuous mode, so packet sniffing is possible, and
@@ -136,5 +128,4 @@ config ARCNET_COM20020_PCI
 	tristate "Support for COM20020 on PCI"
 	depends on ARCNET_COM20020 && PCI
 
-endmenu
-
+endif # ARCNET
#<EOF>

[PATCH 21/30] Use menuconfig objects - PHY

[Jan Engelhardt]

(No MAINTAINERS entry. MODULE_AUTHOR lines exist, but without addresses.)

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/net/phy/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/net/phy/Kconfig
+++ linux-2.6.21-rc5/drivers/net/phy/Kconfig
@@ -2,9 +2,7 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
 	tristate "PHY Device support and infrastructure"
 	depends on NET_ETHERNET && (BROKEN || !S390)
 	help
@@ -12,59 +10,52 @@ config PHYLIB
 	  devices.  This option provides infrastructure for
 	  managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-	depends on PHYLIB
 
 config MARVELL_PHY
 	tristate "Drivers for Marvell PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently has a driver for the 88E1011S
 	
 config DAVICOM_PHY
 	tristate "Drivers for Davicom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
 	tristate "Drivers for Quality Semiconductor PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the qs6612
 
 config LXT_PHY
 	tristate "Drivers for the Intel LXT PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the lxt970, lxt971
 
 config CICADA_PHY
 	tristate "Drivers for the Cicada PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the cis8204
+
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
 	tristate "Drivers for SMSC PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the LAN83C185 PHY
 
 config BROADCOM_PHY
 	tristate "Drivers for Broadcom PHYs"
-	depends on PHYLIB
 	---help---
 	  Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
 
 config FIXED_PHY
 	tristate "Drivers for PHY emulation on fixed speed/link"
-	depends on PHYLIB
 	---help---
 	  Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
 	  but with the ability to manipulate the speed/link in software. The relevant MII
@@ -79,5 +70,4 @@ config FIXED_MII_100_FDX
 	bool "Emulation for 100M Fdx fixed PHY behavior"
 	depends on FIXED_PHY
 
-endmenu
-
+endif # PHYLIB
#<EOF>

[PATCH 22/30] Use menuconfig objects - toeknring

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/net/tokenring/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/net/tokenring/Kconfig
+++ linux-2.6.21-rc5/drivers/net/tokenring/Kconfig
@@ -2,12 +2,10 @@
 # Token Ring driver configuration
 #
 
-menu "Token Ring devices"
-	depends on NETDEVICES && !UML
-
 # So far, we only have PCI, ISA, and MCA token ring devices
-config TR
+menuconfig TR
 	bool "Token Ring driver support"
+	depends on NETDEVICES && !UML
 	depends on (PCI || ISA || MCA || CCW)
 	select LLC
 	help
@@ -20,9 +18,11 @@ config TR
 	  from <http://www.tldp.org/docs.html#howto>. Most people can
 	  say N here.
 
+if TR
+
 config IBMTR
 	tristate "IBM Tropic chipset based adapter support"
-	depends on TR && (ISA || MCA)
+	depends on ISA || MCA
 	---help---
 	  This is support for all IBM Token Ring cards that don't use DMA. If
 	  you have such a beast, say Y and read the Token-Ring mini-HOWTO,
@@ -36,7 +36,7 @@ config IBMTR
 
 config IBMOL
 	tristate "IBM Olympic chipset PCI adapter support"
-	depends on TR && PCI
+	depends on PCI
 	---help---
 	  This is support for all non-Lanstreamer IBM PCI Token Ring Cards.
 	  Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II
@@ -54,7 +54,7 @@ config IBMOL
 
 config IBMLS
 	tristate "IBM Lanstreamer chipset PCI adapter support"
-	depends on TR && PCI && !64BIT
+	depends on PCI && !64BIT
 	help
 	  This is support for IBM Lanstreamer PCI Token Ring Cards.
 
@@ -66,7 +66,7 @@ config IBMLS
 
 config 3C359
 	tristate "3Com 3C359 Token Link Velocity XL adapter support"
-	depends on TR && PCI
+	depends on PCI
 	---help---
 	  This is support for the 3Com PCI Velocity XL cards, specifically
 	  the 3Com 3C359, please note this is not for the 3C339 cards, you
@@ -84,7 +84,7 @@ config 3C359
 
 config TMS380TR
 	tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
-	depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
+	depends on PCI || ISA && ISA_DMA_API || MCA
 	select FW_LOADER
 	---help---
 	  This driver provides generic support for token ring adapters
@@ -108,7 +108,7 @@ config TMS380TR
 
 config TMSPCI
 	tristate "Generic TMS380 PCI support"
-	depends on TR && TMS380TR && PCI
+	depends on TMS380TR && PCI
 	---help---
 	  This tms380 module supports generic TMS380-based PCI cards.
 
@@ -123,7 +123,7 @@ config TMSPCI
 
 config SKISA
 	tristate "SysKonnect TR4/16 ISA support"
-	depends on TR && TMS380TR && ISA
+	depends on TMS380TR && ISA
 	help
 	  This tms380 module supports SysKonnect TR4/16 ISA cards.
 
@@ -135,7 +135,7 @@ config SKISA
 
 config PROTEON
 	tristate "Proteon ISA support"
-	depends on TR && TMS380TR && ISA
+	depends on TMS380TR && ISA
 	help
 	  This tms380 module supports Proteon ISA cards.
 
@@ -148,7 +148,7 @@ config PROTEON
 
 config ABYSS
 	tristate "Madge Smart 16/4 PCI Mk2 support"
-	depends on TR && TMS380TR && PCI
+	depends on TMS380TR && PCI
 	help
 	  This tms380 module supports the Madge Smart 16/4 PCI Mk2
 	  cards (51-02).
@@ -158,7 +158,7 @@ config ABYSS
 
 config MADGEMC
 	tristate "Madge Smart 16/4 Ringnode MicroChannel"
-	depends on TR && TMS380TR && MCA
+	depends on TMS380TR && MCA
 	help
 	  This tms380 module supports the Madge Smart 16/4 MC16 and MC32
 	  MicroChannel adapters.
@@ -168,7 +168,7 @@ config MADGEMC
 
 config SMCTR
 	tristate "SMC ISA/MCA adapter support"
-	depends on TR && (ISA || MCA_LEGACY) && (BROKEN || !64BIT)
+	depends on (ISA || MCA_LEGACY) && (BROKEN || !64BIT)
 	---help---
 	  This is support for the ISA and MCA SMC Token Ring cards,
 	  specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
@@ -182,5 +182,4 @@ config SMCTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called smctr.
 
-endmenu
-
+endif # TR
#<EOF>

[PATCH 23/30] Use menuconfig objects - netdev

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/net/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/net/Kconfig
+++ linux-2.6.21-rc5/drivers/net/Kconfig
@@ -1897,8 +1897,12 @@ endmenu
 #	Gigabit Ethernet
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NETDEV_1000
+	bool "Ethernet (1000 Mbit)"
 	depends on !UML
+	default y
+
+if NETDEV_1000
 
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2327,14 +2331,18 @@ config ATL1
 	  To compile this driver as a module, choose M here.  The module
 	  will be called atl1.
 
-endmenu
+endif # NETDEV_1000
 
 #
 #	10 Gigabit Ethernet
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NETDEV_10000
+	bool "Ethernet (10000 Mbit)"
 	depends on !UML
+	default y
+
+if NETDEV_10000
 
 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
@@ -2493,7 +2501,7 @@ config PASEMI_MAC
 	  This driver supports the on-chip 1/10Gbit Ethernet controller on
 	  PA Semi's PWRficient line of chips.
 
-endmenu
+endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
 
#<EOF>

[PATCH 24/30] Use menuconfig objects - oldcd

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/cdrom/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/cdrom/Kconfig
+++ linux-2.6.21-rc5/drivers/cdrom/Kconfig
@@ -2,11 +2,9 @@
 # CDROM driver configuration
 #
 
-menu "Old CD-ROM drivers (not SCSI, not IDE)"
+menuconfig CD_NO_IDESCSI
+	bool "Old CD-ROM drivers (not SCSI, not IDE)"
 	depends on ISA && BLOCK
-
-config CD_NO_IDESCSI
-	bool "Support non-SCSI/IDE/ATAPI CDROM drives"
 	---help---
 	  If you have a CD-ROM drive that is neither SCSI nor IDE/ATAPI, say Y
 	  here, otherwise N. Read the CD-ROM-HOWTO, available from
@@ -31,9 +29,10 @@ config CD_NO_IDESCSI
 	  answer will get "defaulted" for you if you enable any of the Linux
 	  CD-ROM drivers).
 
+if CD_NO_IDESCSI
+
 config AZTCD
 	tristate "Aztech/Orchid/Okano/Wearnes/TXC/CyDROM  CDROM support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  This is your driver if you have an Aztech CDA268-01A, Orchid
 	  CD-3110, Okano or Wearnes CDD110, Conrad TXC, or CyCD-ROM CR520 or
@@ -51,7 +50,6 @@ config AZTCD
 
 config GSCD
 	tristate "Goldstar R420 CDROM support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  If this is your CD-ROM drive, say Y here.  As described in the file
 	  <file:Documentation/cdrom/gscd>, you might have to change a setting
@@ -67,7 +65,7 @@ config GSCD
 
 config SBPCD
 	tristate "Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support"
-	depends on CD_NO_IDESCSI && BROKEN_ON_SMP
+	depends on BROKEN_ON_SMP
 	---help---
 	  This driver supports most of the drives which use the Panasonic or
 	  Sound Blaster interface.  Please read the file
@@ -105,7 +103,6 @@ config SBPCD
 
 config MCDX
 	tristate "Mitsumi CDROM support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  Use this driver if you want to be able to use your Mitsumi LU-005,
 	  FX-001 or FX-001D CD-ROM drive.
@@ -121,7 +118,6 @@ config MCDX
 
 config OPTCD
 	tristate "Optics Storage DOLPHIN 8000AT CDROM support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  This is the driver for the 'DOLPHIN' drive with a 34-pin Sony
 	  compatible interface. It also works with the Lasermate CR328A. If
@@ -138,7 +134,7 @@ config OPTCD
 
 config CM206
 	tristate "Philips/LMS CM206 CDROM support"
-	depends on CD_NO_IDESCSI && BROKEN_ON_SMP
+	depends on BROKEN_ON_SMP
 	---help---
 	  If you have a Philips/LMS CD-ROM drive cm206 in combination with a
 	  cm260 host adapter card, say Y here. Please also read the file
@@ -153,7 +149,6 @@ config CM206
 
 config SJCD
 	tristate "Sanyo CDR-H94A CDROM support"
-	depends on CD_NO_IDESCSI
 	help
 	  If this is your CD-ROM drive, say Y here and read the file
 	  <file:Documentation/cdrom/sjcd>. You should then also say Y or M to
@@ -165,7 +160,6 @@ config SJCD
 
 config ISP16_CDI
 	tristate "ISP16/MAD16/Mozart soft configurable cdrom interface support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  These are sound cards with built-in cdrom interfaces using the OPTi
 	  82C928 or 82C929 chips. Say Y here to have them detected and
@@ -178,7 +172,7 @@ config ISP16_CDI
 
 config CDU31A
 	tristate "Sony CDU31A/CDU33A CDROM support"
-	depends on CD_NO_IDESCSI && BROKEN_ON_SMP
+	depends on BROKEN_ON_SMP
 	---help---
 	  These CD-ROM drives have a spring-pop-out caddyless drawer, and a
 	  rectangular green LED centered beneath it.  NOTE: these CD-ROM
@@ -198,7 +192,6 @@ config CDU31A
 
 config CDU535
 	tristate "Sony CDU535 CDROM support"
-	depends on CD_NO_IDESCSI
 	---help---
 	  This is the driver for the older Sony CDU-535 and CDU-531 CD-ROM
 	  drives. Please read the file <file:Documentation/cdrom/sonycd535>.
@@ -210,4 +203,4 @@ config CDU535
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonycd535.
 
-endmenu
+endif # CD_NO_IDESCSI
#<EOF>

[PATCH 25/30] Use menuconfig objects - parport

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/parport/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/parport/Kconfig
+++ linux-2.6.21-rc5/drivers/parport/Kconfig
@@ -5,9 +5,7 @@
 # Parport configuration.
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
 	tristate "Parallel port support"
 	---help---
 	  If you want to use devices connected to your machine's parallel port
@@ -32,9 +30,11 @@ config PARPORT
 
 	  If unsure, say Y.
 
+if PARPORT
+
 config PARPORT_PC
 	tristate "PC-style hardware"
-	depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
+	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All
 	  IBM PC compatible computers and some Alphas have PC-style
@@ -84,7 +84,7 @@ config PARPORT_PC_PCMCIA
 
 config PARPORT_IP32
 	tristate "SGI IP32 builtin port (EXPERIMENTAL)"
-	depends on SGI_IP32 && PARPORT && EXPERIMENTAL
+	depends on SGI_IP32 && EXPERIMENTAL
 	select PARPORT_NOT_PC
 	help
 	  Say Y here if you need support for the parallel port on
@@ -93,7 +93,7 @@ config PARPORT_IP32
 
 config PARPORT_AMIGA
 	tristate "Amiga builtin port"
-	depends on AMIGA && PARPORT
+	depends on AMIGA
 	select PARPORT_NOT_PC
 	help
 	  Say Y here if you need support for the parallel port hardware on
@@ -102,7 +102,7 @@ config PARPORT_AMIGA
 
 config PARPORT_MFC3
 	tristate "Multiface III parallel port"
-	depends on ZORRO && PARPORT
+	depends on ZORRO
 	select PARPORT_NOT_PC
 	help
 	  Say Y here if you need parallel port support for the MFC3 card.
@@ -111,7 +111,7 @@ config PARPORT_MFC3
 
 config PARPORT_ATARI
 	tristate "Atari hardware"
-	depends on ATARI && PARPORT
+	depends on ATARI
 	select PARPORT_NOT_PC
 	help
 	  Say Y here if you need support for the parallel port hardware on
@@ -121,12 +121,11 @@ config PARPORT_ATARI
 config PARPORT_GSC
 	tristate
 	default GSC
-	depends on PARPORT
 	select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
 	tristate "Sparc hardware (EXPERIMENTAL)"
-	depends on SBUS && PARPORT && EXPERIMENTAL
+	depends on SBUS && EXPERIMENTAL
 	select PARPORT_NOT_PC
 	help
 	  This driver provides support for the bidirectional parallel port
@@ -135,7 +134,6 @@ config PARPORT_SUNBPP
 
 config PARPORT_AX88796
 	tristate "AX88796 Parallel Port"
-	depends on PARPORT
 	select PARPORT_NOT_PC
 	help
 	  Say Y here if you need support for the parallel port hardware on
@@ -147,7 +145,6 @@ config PARPORT_AX88796
 
 config PARPORT_1284
 	bool "IEEE 1284 transfer modes"
-	depends on PARPORT
 	help
 	  If you have a printer that supports status readback or device ID, or
 	  want to use a device that uses enhanced parallel port transfer modes
@@ -158,5 +155,4 @@ config PARPORT_1284
 config PARPORT_NOT_PC
 	bool
 
-endmenu
-
+endif # PARPORT
#<EOF>

Re: [PATCH 0/30] Use menuconfig objects

[David Lang]

On Wed, 11 Apr 2007, Stefan Richter wrote:

> Jan Engelhardt wrote:
>> the following patch series turns some menus into menuconfigs, so they
>> can be disabled whilst "walking" thorugh the parent menu (check the
>> videos [1], [2] to see what I mean), enabling for disabling lots of
>> options _quickly_.
>>
>> I'll send the patches (as a reply to this mail) piece by piece out
>> when I figure out the maintainers to Cc for each.
>>
>> [1] 6.04 MB(1000s) 70 sec http://jengelh.hopto.org/mc/without.ogg
>> [2] 1.96 MB(1000s) 44 sec http://jengelh.hopto.org/mc/with.ogg
>> (Ogg container, Theora Video, no audio)
>>
>> I have not poked on all subsystems (it is quite a lot), but I can
>> already give a glimpse (`ls -1`) of who gets one and who does not.
>> And, I am not completely finished changing some subsystems - but
>> the patches are already big enough for a first wave. I want to get
>> some feedback first. Thanks!
>
> I haven't watched your videos yet but I tried one of the patches
>  - with make xconfig: OK
>  - with make gconfig: OK
>  - with make menuconfig: less so, because:
> When one switches a menuconfig _on_, one might miss that there are
> subsequent options to configure.  (Although the availability of further
> options is indicated by the '--->' suffix to the menu title.)

I use menuconfig almost excludively, there are already quite a few cases where 
the menuconfig is used, so you already need to watch out for the '--->' when you 
turn it on.

I haven't applied this patch series, but I definantly like the concept. I spend 
a _lot_ of time with a new kernel going through and entering menus for the sole 
purpose of disabling everything in them, being able to do so from the level 
above would be nice.

that being said, I also won't object to anything that makes these more obvious, 
but it's not a new problem for people useing menuconfig.

David Lang

[PATCH 26/30] Use menuconfig objects - pcihotplug

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/pci/hotplug/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/pci/hotplug/Kconfig
+++ linux-2.6.21-rc5/drivers/pci/hotplug/Kconfig
@@ -2,9 +2,7 @@
 # PCI Hotplug support
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL && HOTPLUG
 	---help---
@@ -17,9 +15,10 @@ config HOTPLUG_PCI
 
 	  When in doubt, say N.
 
+if HOTPLUG_PCI
+
 config HOTPLUG_PCI_FAKE
 	tristate "Fake PCI Hotplug driver"
-	depends on HOTPLUG_PCI
 	help
 	  Say Y here if you want to use the fake PCI hotplug driver. It can
 	  be used to simulate PCI hotplug events if even if your system is
@@ -42,7 +41,7 @@ config HOTPLUG_PCI_FAKE
 
 config HOTPLUG_PCI_COMPAQ
 	tristate "Compaq PCI Hotplug driver"
-	depends on HOTPLUG_PCI && X86 && PCI_BIOS
+	depends on X86 && PCI_BIOS
 	help
 	  Say Y here if you have a motherboard with a Compaq PCI Hotplug
 	  controller.
@@ -64,7 +63,7 @@ config HOTPLUG_PCI_COMPAQ_NVRAM
 
 config HOTPLUG_PCI_IBM
 	tristate "IBM PCI Hotplug driver"
-	depends on HOTPLUG_PCI && X86_IO_APIC && X86 && PCI_BIOS
+	depends on X86_IO_APIC && X86 && PCI_BIOS
 	help
 	  Say Y here if you have a motherboard with a IBM PCI Hotplug
 	  controller.
@@ -76,7 +75,6 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
 	tristate "ACPI PCI Hotplug driver"
-	depends on HOTPLUG_PCI
 	depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK)
 	help
 	  Say Y here if you have a system that supports PCI Hotplug using
@@ -101,7 +99,6 @@ config HOTPLUG_PCI_ACPI_IBM
 
 config HOTPLUG_PCI_CPCI
 	bool "CompactPCI Hotplug driver"
-	depends on HOTPLUG_PCI
 	help
 	  Say Y here if you have a CompactPCI system card with CompactPCI
 	  hotswap support per the PICMG 2.1 specification.
@@ -110,7 +107,7 @@ config HOTPLUG_PCI_CPCI
 
 config HOTPLUG_PCI_CPCI_ZT5550
 	tristate "Ziatech ZT5550 CompactPCI Hotplug driver"
-	depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+	depends on HOTPLUG_PCI_CPCI && X86
 	help
 	  Say Y here if you have an Performance Technologies (formerly Intel,
           formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.
@@ -122,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
 
 config HOTPLUG_PCI_CPCI_GENERIC
 	tristate "Generic port I/O CompactPCI Hotplug driver"
-	depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+	depends on HOTPLUG_PCI_CPCI && X86
 	help
 	  Say Y here if you have a CompactPCI system card that exposes the #ENUM
 	  hotswap signal as a bit in a system register that can be read through
@@ -135,7 +132,6 @@ config HOTPLUG_PCI_CPCI_GENERIC
 
 config HOTPLUG_PCI_SHPC
 	tristate "SHPC PCI Hotplug driver"
-	depends on HOTPLUG_PCI
 	help
 	  Say Y here if you have a motherboard with a SHPC PCI Hotplug
 	  controller.
@@ -147,7 +143,7 @@ config HOTPLUG_PCI_SHPC
 
 config HOTPLUG_PCI_RPA
 	tristate "RPA PCI Hotplug driver"
-	depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
+	depends on PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
 	help
 	  Say Y here if you have a RPA system that supports PCI Hotplug.
 
@@ -170,12 +166,11 @@ config HOTPLUG_PCI_RPA_DLPAR
 
 config HOTPLUG_PCI_SGI
 	tristate "SGI PCI Hotplug Support"
-	depends on HOTPLUG_PCI && (IA64_SGI_SN2 || IA64_GENERIC)
+	depends on IA64_SGI_SN2 || IA64_GENERIC
 	help
 	  Say Y here if you want to use the SGI Altix Hotplug
 	  Driver for PCI devices.
 
 	  When in doubt, say N.
 
-endmenu
-
+endif # HOTPLUG_PCI
#<EOF>

[PATCH 27/30] Use menuconfig objects - PCMCIA

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/pcmcia/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/pcmcia/Kconfig
+++ linux-2.6.21-rc5/drivers/pcmcia/Kconfig
@@ -2,9 +2,7 @@
 # PCCARD (PCMCIA/CardBus) bus subsystem configuration
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
 	tristate "PCCard (PCMCIA/CardBus) support"
 	depends on HOTPLUG
 	---help---
@@ -277,5 +275,3 @@ config PCCARD_IODYN
 	bool
 
 endif	# PCCARD
-
-endmenu
#<EOF>

[PATCH 28/30] Use menuconfig objects - PNP

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/pnp/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/pnp/Kconfig
+++ linux-2.6.21-rc5/drivers/pnp/Kconfig
@@ -2,9 +2,7 @@
 # Plug and Play configuration
 #
 
-menu "Plug and Play support"
-
-config PNP
+menuconfig PNP
 	bool "Plug and Play support"
 	depends on ISA || ACPI
 	---help---
@@ -21,15 +19,15 @@ config PNP
 
 	  If unsure, say Y.
 
+if PNP
+
 config PNP_DEBUG
 	bool "PnP Debug Messages"
-	depends on PNP
 	help
 	  Say Y if you want the Plug and Play Layer to print debug messages.
 	  This is useful if you are developing a PnP driver or troubleshooting.
 
 comment "Protocols"
-	depends on PNP
 
 source "drivers/pnp/isapnp/Kconfig"
 
@@ -37,5 +35,4 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
 
-endmenu
-
+endif # PNP
Index: linux-2.6.21-rc5/drivers/pnp/isapnp/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/pnp/isapnp/Kconfig
+++ linux-2.6.21-rc5/drivers/pnp/isapnp/Kconfig
@@ -3,7 +3,7 @@
 #
 config ISAPNP
 	bool "ISA Plug and Play support"
-	depends on PNP && ISA
+	depends on ISA
 	help
 	  Say Y here if you would like support for ISA Plug and Play devices.
 	  Some information is in <file:Documentation/isapnp.txt>.
Index: linux-2.6.21-rc5/drivers/pnp/pnpbios/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/pnp/pnpbios/Kconfig
+++ linux-2.6.21-rc5/drivers/pnp/pnpbios/Kconfig
@@ -3,7 +3,7 @@
 #
 config PNPBIOS
 	bool "Plug and Play BIOS support (EXPERIMENTAL)"
-	depends on PNP && ISA && X86 && EXPERIMENTAL
+	depends on ISA && X86 && EXPERIMENTAL
 	default n
 	---help---
 	  Linux uses the PNPBIOS as defined in "Plug and Play BIOS
#<EOF>

[PATCH 29/30] Use menuconfig objects - SCSI

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/scsi/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/Kconfig
+++ linux-2.6.21-rc5/drivers/scsi/Kconfig
@@ -279,12 +279,16 @@ source "drivers/scsi/libsas/Kconfig"
 
 endmenu
 
-menu "SCSI low-level drivers"
+menuconfig SCSI_LOWLEVEL
+	bool "SCSI low-level drivers"
 	depends on SCSI!=n
+	default y
+
+if SCSI_LOWLEVEL
 
 config ISCSI_TCP
 	tristate "iSCSI Initiator over TCP/IP"
-	depends on SCSI && INET
+	depends on INET
 	select CRYPTO
 	select CRYPTO_MD5
 	select CRYPTO_CRC32C
@@ -308,25 +312,25 @@ config ISCSI_TCP
 
 config SGIWD93_SCSI
 	tristate "SGI WD93C93 SCSI Driver"
-	depends on SGI_IP22 && SCSI
+	depends on SGI_IP22
   	help
 	  If you have a Western Digital WD93 SCSI controller on
 	  an SGI MIPS system, say Y.  Otherwise, say N.
 
 config SCSI_DECNCR
 	tristate "DEC NCR53C94 Scsi Driver"
-	depends on MACH_DECSTATION && SCSI && TC
+	depends on MACH_DECSTATION && TC
 	help
 	  Say Y here to support the NCR53C94 SCSI controller chips on IOASIC
 	  based TURBOchannel DECstations and TURBOchannel PMAZ-A cards.
 
 config SCSI_DECSII
 	tristate "DEC SII Scsi Driver"
-	depends on MACH_DECSTATION && SCSI && 32BIT
+	depends on MACH_DECSTATION && 32BIT
 
 config BLK_DEV_3W_XXXX_RAID
 	tristate "3ware 5/6/7/8xxx ATA-RAID support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  3ware is the only hardware ATA-Raid product in Linux to date.
 	  This card is 2,4, or 8 channel master mode support only.
@@ -339,7 +343,7 @@ config BLK_DEV_3W_XXXX_RAID
 
 config SCSI_3W_9XXX
 	tristate "3ware 9xxx SATA-RAID support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  This driver supports the 9000 series 3ware SATA-RAID cards.
 
@@ -350,7 +354,7 @@ config SCSI_3W_9XXX
 
 config SCSI_7000FASST
 	tristate "7000FASST SCSI support"
-	depends on ISA && SCSI && ISA_DMA_API
+	depends on ISA && ISA_DMA_API
 	help
 	  This driver supports the Western Digital 7000 SCSI host adapter
 	  family.  Some information is in the source:
@@ -361,7 +365,7 @@ config SCSI_7000FASST
 
 config SCSI_ACARD
 	tristate "ACARD SCSI support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  This driver supports the ACARD SCSI host adapter.
 	  Support Chip <ATP870 ATP876 ATP880 ATP885>
@@ -370,7 +374,7 @@ config SCSI_ACARD
 
 config SCSI_AHA152X
 	tristate "Adaptec AHA152X/2825 support"
-	depends on ISA && SCSI && !64BIT
+	depends on ISA && !64BIT
 	select SCSI_SPI_ATTRS
 	---help---
 	  This is a driver for the AHA-1510, AHA-1520, AHA-1522, and AHA-2825
@@ -386,7 +390,7 @@ config SCSI_AHA152X
 
 config SCSI_AHA1542
 	tristate "Adaptec AHA1542 support"
-	depends on ISA && SCSI && ISA_DMA_API
+	depends on ISA && ISA_DMA_API
 	---help---
 	  This is support for a SCSI host adapter.  It is explained in section
 	  3.4 of the SCSI-HOWTO, available from
@@ -400,7 +404,7 @@ config SCSI_AHA1542
 
 config SCSI_AHA1740
 	tristate "Adaptec AHA1740 support"
-	depends on EISA && SCSI
+	depends on EISA
 	---help---
 	  This is support for a SCSI host adapter.  It is explained in section
 	  3.5 of the SCSI-HOWTO, available from
@@ -413,7 +417,7 @@ config SCSI_AHA1740
 
 config SCSI_AACRAID
 	tristate "Adaptec AACRAID support"
-	depends on SCSI && PCI
+	depends on PCI
 	help
 	  This driver supports a variety of Dell, HP, Adaptec, IBM and
 	  ICP storage products. For a list of supported products, refer
@@ -427,7 +431,7 @@ source "drivers/scsi/aic7xxx/Kconfig.aic
 
 config SCSI_AIC7XXX_OLD
 	tristate "Adaptec AIC7xxx support (old driver)"
-	depends on (ISA || EISA || PCI ) && SCSI
+	depends on ISA || EISA || PCI
 	help
 	  WARNING This driver is an older aic7xxx driver and is no longer
 	  under active development.  Adaptec, Inc. is writing a new driver to
@@ -471,7 +475,7 @@ source "drivers/scsi/aic94xx/Kconfig"
 # All the I2O code and drivers do not seem to be 64bit safe.
 config SCSI_DPT_I2O
 	tristate "Adaptec I2O RAID support "
-	depends on !64BIT && SCSI && PCI
+	depends on !64BIT && PCI
 	help
 	  This driver supports all of Adaptec's I2O based RAID controllers as 
 	  well as the DPT SmartRaid V cards.  This is an Adaptec maintained
@@ -482,7 +486,6 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
 	tristate "AdvanSys SCSI support"
-	depends on SCSI
 	depends on ISA || EISA || PCI
 	depends on BROKEN || X86_32
 	help
@@ -495,7 +498,7 @@ config SCSI_ADVANSYS
 
 config SCSI_IN2000
 	tristate "Always IN2000 SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	help
 	  This is support for an ISA bus SCSI host adapter.  You'll find more
 	  information in <file:Documentation/scsi/in2000.txt>. If it doesn't work
@@ -507,7 +510,7 @@ config SCSI_IN2000
 
 config SCSI_ARCMSR
 	tristate "ARECA ARC11X0[PCI-X]/ARC12X0[PCI-EXPRESS] SATA-RAID support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  This driver supports all of ARECA's SATA RAID controller cards.
 	  This is an ARECA-maintained driver by Erich Chen.
@@ -523,7 +526,7 @@ source "drivers/scsi/megaraid/Kconfig.me
 
 config SCSI_HPTIOP
 	tristate "HighPoint RocketRAID 3xxx Controller support"
-	depends on SCSI && PCI
+	depends on PCI
 	help
 	  This option enables support for HighPoint RocketRAID 3xxx
 	  controllers.
@@ -533,7 +536,7 @@ config SCSI_HPTIOP
 
 config SCSI_BUSLOGIC
 	tristate "BusLogic SCSI support"
-	depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
+	depends on (PCI || ISA || MCA) && ISA_DMA_API
 	---help---
 	  This is support for BusLogic MultiMaster and FlashPoint SCSI Host
 	  Adapters. Consult the SCSI-HOWTO, available from
@@ -555,7 +558,7 @@ config SCSI_OMIT_FLASHPOINT
 
 config SCSI_DMX3191D
 	tristate "DMX3191D SCSI support"
-	depends on PCI && SCSI
+	depends on PCI
 	select SCSI_SPI_ATTRS
 	help
 	  This is support for Domex DMX3191D SCSI Host Adapters.
@@ -565,7 +568,7 @@ config SCSI_DMX3191D
 
 config SCSI_DTC3280
 	tristate "DTC3180/3280 SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	select SCSI_SPI_ATTRS
 	help
 	  This is support for DTC 3180/3280 SCSI Host Adapters.  Please read
@@ -578,7 +581,7 @@ config SCSI_DTC3280
 
 config SCSI_EATA
 	tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support"
-	depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
+	depends on (ISA || EISA || PCI) && ISA_DMA_API
 	---help---
 	  This driver supports all EATA/DMA-compliant SCSI host adapters.  DPT
 	  ISA and all EISA I/O addresses are probed looking for the "EATA"
@@ -626,7 +629,7 @@ config SCSI_EATA_MAX_TAGS
 
 config SCSI_EATA_PIO
 	tristate "EATA-PIO (old DPT PM2001, PM2012A) support"
-	depends on (ISA || EISA || PCI) && SCSI && BROKEN
+	depends on (ISA || EISA || PCI) && BROKEN
 	---help---
 	  This driver supports all EATA-PIO protocol compliant SCSI Host
 	  Adapters like the DPT PM2001 and the PM2012A.  EATA-DMA compliant
@@ -640,7 +643,7 @@ config SCSI_EATA_PIO
 
 config SCSI_FUTURE_DOMAIN
 	tristate "Future Domain 16xx SCSI/AHA-2920A support"
-	depends on (ISA || PCI) && SCSI
+	depends on ISA || PCI
 	---help---
 	  This is support for Future Domain's 16-bit SCSI host adapters
 	  (TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
@@ -659,7 +662,7 @@ config SCSI_FUTURE_DOMAIN
 
 config SCSI_FD_MCS
 	tristate "Future Domain MCS-600/700 SCSI support"
-	depends on MCA_LEGACY && SCSI
+	depends on MCA_LEGACY
 	---help---
 	  This is support for Future Domain MCS 600/700 MCA SCSI adapters.
 	  Some PS/2 computers are equipped with IBM Fast SCSI Adapter/A which
@@ -672,7 +675,7 @@ config SCSI_FD_MCS
 
 config SCSI_GDTH
 	tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
-	depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
+	depends on (ISA || EISA || PCI) && ISA_DMA_API
 	---help---
 	  Formerly called GDT SCSI Disk Array Controller Support.
 
@@ -686,7 +689,7 @@ config SCSI_GDTH
 
 config SCSI_GENERIC_NCR5380
 	tristate "Generic NCR5380/53c400 SCSI PIO support"
-	depends on ISA && SCSI
+	depends on ISA
 	select SCSI_SPI_ATTRS
 	---help---
 	  This is a driver for the old NCR 53c80 series of SCSI controllers
@@ -706,7 +709,7 @@ config SCSI_GENERIC_NCR5380
 
 config SCSI_GENERIC_NCR5380_MMIO
 	tristate "Generic NCR5380/53c400 SCSI MMIO support"
-	depends on ISA && SCSI
+	depends on ISA
 	select SCSI_SPI_ATTRS
 	---help---
 	  This is a driver for the old NCR 53c80 series of SCSI controllers
@@ -732,7 +735,7 @@ config SCSI_GENERIC_NCR53C400
 
 config SCSI_IBMMCA
 	tristate "IBMMCA SCSI support"
-	depends on MCA_LEGACY && SCSI
+	depends on MCA_LEGACY
 	---help---
 	  This is support for the IBM SCSI adapter found in many of the PS/2
 	  series computers.  These machines have an MCA bus, so you need to
@@ -802,7 +805,7 @@ config IBMMCA_SCSI_DEV_RESET
 
 config SCSI_IPS
 	tristate "IBM ServeRAID support"
-	depends on PCI && SCSI
+	depends on PCI
 	---help---
 	  This is support for the IBM ServeRAID hardware RAID controllers.
 	  See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
@@ -838,7 +841,7 @@ config SCSI_IBMVSCSIS
 
 config SCSI_INITIO
 	tristate "Initio 9100U(W) support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  This is support for the Initio 91XXU(W) SCSI host adapter.  Please
 	  read the SCSI-HOWTO, available from
@@ -849,7 +852,7 @@ config SCSI_INITIO
 
 config SCSI_INIA100
 	tristate "Initio INI-A100U2W support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  This is support for the Initio INI-A100U2W SCSI host adapter.
 	  Please read the SCSI-HOWTO, available from
@@ -860,7 +863,7 @@ config SCSI_INIA100
 
 config SCSI_PPA
 	tristate "IOMEGA parallel port (ppa - older drives)"
-	depends on SCSI && PARPORT_PC
+	depends on PARPORT_PC
 	---help---
 	  This driver supports older versions of IOMEGA's parallel port ZIP
 	  drive (a 100 MB removable media device).
@@ -887,7 +890,7 @@ config SCSI_PPA
 
 config SCSI_IMM
 	tristate "IOMEGA parallel port (imm - newer drives)"
-	depends on SCSI && PARPORT_PC
+	depends on PARPORT_PC
 	---help---
 	  This driver supports newer versions of IOMEGA's parallel port ZIP
 	  drive (a 100 MB removable media device).
@@ -943,7 +946,7 @@ config SCSI_IZIP_SLOW_CTR
 
 config SCSI_NCR53C406A
 	tristate "NCR53c406a SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	help
 	  This is support for the NCR53c406a SCSI host adapter.  For user
 	  configurable parameters, check out <file:drivers/scsi/NCR53c406a.c>
@@ -955,7 +958,7 @@ config SCSI_NCR53C406A
 
 config SCSI_NCR_D700
 	tristate "NCR Dual 700 MCA SCSI support"
-	depends on MCA && SCSI
+	depends on MCA
 	select SCSI_SPI_ATTRS
 	help
 	  This is a driver for the MicroChannel Dual 700 card produced by
@@ -967,7 +970,7 @@ config SCSI_NCR_D700
 
 config SCSI_LASI700
 	tristate "HP Lasi SCSI support for 53c700/710"
-	depends on GSC && SCSI
+	depends on GSC
 	select SCSI_SPI_ATTRS
 	help
 	  This is a driver for the SCSI controller in the Lasi chip found in
@@ -976,7 +979,7 @@ config SCSI_LASI700
 
 config SCSI_SNI_53C710
 	tristate "SNI RM SCSI support for 53c710"
-	depends on SNI_RM && SCSI
+	depends on SNI_RM
 	select SCSI_SPI_ATTRS
 	select 53C700_LE_ON_BE
 	help
@@ -990,7 +993,7 @@ config 53C700_LE_ON_BE
 
 config SCSI_STEX
 	tristate "Promise SuperTrak EX Series support"
-	depends on PCI && SCSI
+	depends on PCI
 	---help---
 	  This driver supports Promise SuperTrak EX series storage controllers.
 
@@ -1002,7 +1005,7 @@ config SCSI_STEX
 
 config SCSI_SYM53C8XX_2
 	tristate "SYM53C8XX Version 2 SCSI support"
-	depends on PCI && SCSI
+	depends on PCI
 	select SCSI_SPI_ATTRS
 	---help---
 	  This driver supports the whole NCR53C8XX/SYM53C8XX family of
@@ -1069,7 +1072,7 @@ config SCSI_SYM53C8XX_MMIO
 
 config SCSI_IPR
 	tristate "IBM Power Linux RAID adapter support"
-	depends on PCI && SCSI && ATA
+	depends on PCI && ATA
 	select FW_LOADER
 	---help---
 	  This driver supports the IBM Power Linux family RAID adapters.
@@ -1096,7 +1099,7 @@ config SCSI_IPR_DUMP
 
 config SCSI_ZALON
 	tristate "Zalon SCSI support"
-	depends on GSC && SCSI
+	depends on GSC
 	select SCSI_SPI_ATTRS
 	help
 	  The Zalon is a GSC/HSC bus interface chip that sits between the
@@ -1107,7 +1110,7 @@ config SCSI_ZALON
 
 config SCSI_NCR_Q720
 	tristate "NCR Quad 720 MCA SCSI support"
-	depends on MCA && SCSI
+	depends on MCA
 	select SCSI_SPI_ATTRS
 	help
 	  This is a driver for the MicroChannel Quad 720 card produced by
@@ -1217,7 +1220,7 @@ config SCSI_NCR53C8XX_NO_DISCONNECT
 
 config SCSI_MCA_53C9X
 	tristate "NCR MCA 53C9x SCSI support"
-	depends on MCA_LEGACY && SCSI && BROKEN_ON_SMP
+	depends on MCA_LEGACY && BROKEN_ON_SMP
 	help
 	  Some MicroChannel machines, notably the NCR 35xx line, use a SCSI
 	  controller based on the NCR 53C94.  This driver will allow use of
@@ -1228,7 +1231,7 @@ config SCSI_MCA_53C9X
 
 config SCSI_PAS16
 	tristate "PAS16 SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	select SCSI_SPI_ATTRS
 	---help---
 	  This is support for a SCSI host adapter.  It is explained in section
@@ -1242,7 +1245,7 @@ config SCSI_PAS16
 
 config SCSI_PSI240I
 	tristate "PSI240i support"
-	depends on ISA && SCSI
+	depends on ISA
 	help
 	  This is support for the PSI240i EIDE interface card which acts as a
 	  SCSI host adapter.  Please read the SCSI-HOWTO, available from
@@ -1253,7 +1256,7 @@ config SCSI_PSI240I
 
 config SCSI_QLOGIC_FAS
 	tristate "Qlogic FAS SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	---help---
 	  This is a driver for the ISA, VLB, and PCMCIA versions of the Qlogic
 	  FastSCSI! cards as well as any other card based on the FASXX chip
@@ -1281,7 +1284,7 @@ config SCSI_QLOGIC_FC_FIRMWARE
 
 config SCSI_QLOGIC_1280
 	tristate "Qlogic QLA 1240/1x80/1x160 SCSI support"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	  Say Y if you have a QLogic ISP1240/1x80/1x160 SCSI host adapter.
 
@@ -1290,7 +1293,7 @@ config SCSI_QLOGIC_1280
 
 config SCSI_QLOGICPTI
 	tristate "PTI Qlogic, ISP Driver"
-	depends on SBUS && SCSI
+	depends on SBUS
 	help
 	  This driver supports SBUS SCSI controllers from PTI or QLogic. These
 	  controllers are known under Solaris as qpti and in the openprom as
@@ -1305,7 +1308,7 @@ source "drivers/scsi/qla4xxx/Kconfig"
 
 config SCSI_LPFC
 	tristate "Emulex LightPulse Fibre Channel Support"
-	depends on PCI && SCSI
+	depends on PCI
 	select SCSI_FC_ATTRS
 	help
           This lpfc driver supports the Emulex LightPulse
@@ -1313,7 +1316,7 @@ config SCSI_LPFC
 
 config SCSI_SEAGATE
 	tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
-	depends on X86 && ISA && SCSI
+	depends on X86 && ISA
 	---help---
 	  These are 8-bit SCSI controllers; the ST-01 is also supported by
 	  this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
@@ -1327,7 +1330,7 @@ config SCSI_SEAGATE
 # definitely looks not 64bit safe:
 config SCSI_SIM710
 	tristate "Simple 53c710 SCSI support (Compaq, NCR machines)"
-	depends on (EISA || MCA) && SCSI
+	depends on EISA || MCA
 	select SCSI_SPI_ATTRS
 	---help---
 	  This driver for NCR53c710 based SCSI host adapters.
@@ -1341,7 +1344,7 @@ config 53C700_IO_MAPPED
 
 config SCSI_SYM53C416
 	tristate "Symbios 53c416 SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	---help---
 	  This is support for the sym53c416 SCSI host adapter, the SCSI
 	  adapter that comes with some HP scanners. This driver requires that
@@ -1359,7 +1362,7 @@ config SCSI_SYM53C416
 
 config SCSI_DC395x
 	tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support (EXPERIMENTAL)"
-	depends on PCI && SCSI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	---help---
 	  This driver supports PCI SCSI host adapters based on the ASIC
 	  TRM-S1040 chip, e.g Tekram DC395(U/UW/F) and DC315(U) variants.
@@ -1374,7 +1377,7 @@ config SCSI_DC395x
 
 config SCSI_DC390T
 	tristate "Tekram DC390(T) and Am53/79C974 SCSI support"
-	depends on PCI && SCSI
+	depends on PCI
 	---help---
 	  This driver supports PCI SCSI host adapters based on the Am53C974A
 	  chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard
@@ -1390,7 +1393,7 @@ config SCSI_DC390T
 
 config SCSI_T128
 	tristate "Trantor T128/T128F/T228 SCSI support"
-	depends on ISA && SCSI
+	depends on ISA
 	select SCSI_SPI_ATTRS
 	---help---
 	  This is support for a SCSI host adapter. It is explained in section
@@ -1406,7 +1409,7 @@ config SCSI_T128
 
 config SCSI_U14_34F
 	tristate "UltraStor 14F/34F support"
-	depends on ISA && SCSI && ISA_DMA_API
+	depends on ISA && ISA_DMA_API
 	---help---
 	  This is support for the UltraStor 14F and 34F SCSI-2 host adapters.
 	  The source at <file:drivers/scsi/u14-34f.c> contains some
@@ -1455,7 +1458,7 @@ config SCSI_U14_34F_MAX_TAGS
 
 config SCSI_ULTRASTOR
 	tristate "UltraStor SCSI support"
-	depends on X86 && ISA && SCSI
+	depends on X86 && ISA
 	---help---
 	  This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
 	  adapter family.  This driver is explained in section 3.12 of the
@@ -1472,7 +1475,7 @@ config SCSI_ULTRASTOR
 
 config SCSI_NSP32
 	tristate "Workbit NinjaSCSI-32Bi/UDE support"
-	depends on PCI && SCSI && !64BIT
+	depends on PCI && !64BIT
 	help
 	  This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
 	  SCSI host adapter. Please read the SCSI-HOWTO, available from
@@ -1483,7 +1486,6 @@ config SCSI_NSP32
 
 config SCSI_DEBUG
 	tristate "SCSI debugging host simulator"
-	depends on SCSI
 	help
 	  This is a host adapter simulator that can simulate multiple hosts
 	  each with multiple dummy SCSI devices (disks). It defaults to one
@@ -1496,7 +1498,7 @@ config SCSI_DEBUG
 
 config SCSI_MESH
 	tristate "MESH (Power Mac internal SCSI) support"
-	depends on PPC32 && PPC_PMAC && SCSI
+	depends on PPC32 && PPC_PMAC
 	help
 	  Many Power Macintoshes and clones have a MESH (Macintosh Enhanced
 	  SCSI Hardware) SCSI bus adaptor (the 7200 doesn't, but all of the
@@ -1527,7 +1529,7 @@ config SCSI_MESH_RESET_DELAY_MS
 
 config SCSI_MAC53C94
 	tristate "53C94 (Power Mac external SCSI) support"
-	depends on PPC32 && PPC_PMAC && SCSI
+	depends on PPC32 && PPC_PMAC
 	help
 	  On Power Macintoshes (and clones) with two SCSI buses, the external
 	  SCSI bus is usually controlled by a 53C94 SCSI bus adaptor. Older
@@ -1541,7 +1543,7 @@ source "drivers/scsi/arm/Kconfig"
 
 config JAZZ_ESP
 	bool "MIPS JAZZ FAS216 SCSI support"
-	depends on MACH_JAZZ && SCSI
+	depends on MACH_JAZZ
 	help
 	  This is the driver for the onboard SCSI host adapter of MIPS Magnum
 	  4000, Acer PICA, Olivetti M700-10 and a few other identical OEM
@@ -1549,7 +1551,7 @@ config JAZZ_ESP
 
 config A3000_SCSI
 	tristate "A3000 WD33C93A support"
-	depends on AMIGA && SCSI
+	depends on AMIGA
 	help
 	  If you have an Amiga 3000 and have SCSI devices connected to the
 	  built-in SCSI controller, say Y. Otherwise, say N.
@@ -1559,7 +1561,7 @@ config A3000_SCSI
 
 config A2091_SCSI
 	tristate "A2091/A590 WD33C93A support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have a Commodore A2091 SCSI controller, say Y. Otherwise,
 	  say N.
@@ -1569,7 +1571,7 @@ config A2091_SCSI
 
 config GVP11_SCSI
 	tristate "GVP Series II WD33C93A support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	---help---
 	  If you have a Great Valley Products Series II SCSI controller,
 	  answer Y. Also say Y if you have a later model of GVP SCSI
@@ -1582,7 +1584,7 @@ config GVP11_SCSI
 
 config CYBERSTORM_SCSI
 	tristate "CyberStorm SCSI support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have an Amiga with an original (MkI) Phase5 Cyberstorm
 	  accelerator board and the optional Cyberstorm SCSI controller,
@@ -1590,7 +1592,7 @@ config CYBERSTORM_SCSI
 
 config CYBERSTORMII_SCSI
 	tristate "CyberStorm Mk II SCSI support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have an Amiga with a Phase5 Cyberstorm MkII accelerator board
 	  and the optional Cyberstorm SCSI controller, say Y. Otherwise,
@@ -1598,7 +1600,7 @@ config CYBERSTORMII_SCSI
 
 config BLZ2060_SCSI
 	tristate "Blizzard 2060 SCSI support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have an Amiga with a Phase5 Blizzard 2060 accelerator board
 	  and want to use the onboard SCSI controller, say Y. Otherwise,
@@ -1606,7 +1608,7 @@ config BLZ2060_SCSI
 
 config BLZ1230_SCSI
 	tristate "Blizzard 1230IV/1260 SCSI support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have an Amiga 1200 with a Phase5 Blizzard 1230IV or Blizzard
 	  1260 accelerator, and the optional SCSI module, say Y. Otherwise,
@@ -1614,14 +1616,14 @@ config BLZ1230_SCSI
 
 config FASTLANE_SCSI
 	tristate "Fastlane SCSI support"
-	depends on ZORRO && SCSI
+	depends on ZORRO
 	help
 	  If you have the Phase5 Fastlane Z3 SCSI controller, or plan to use
 	  one in the near future, say Y to this question. Otherwise, say N.
 
 config SCSI_AMIGA7XX
 	bool "Amiga NCR53c710 SCSI support (EXPERIMENTAL)"
-	depends on AMIGA && SCSI && EXPERIMENTAL && BROKEN
+	depends on AMIGA && EXPERIMENTAL && BROKEN
 	help
 	  Support for various NCR53c710-based SCSI controllers on the Amiga.
 	  This includes:
@@ -1640,7 +1642,7 @@ config SCSI_AMIGA7XX
 
 config OKTAGON_SCSI
 	tristate "BSC Oktagon SCSI support (EXPERIMENTAL)"
-	depends on ZORRO && SCSI && EXPERIMENTAL
+	depends on ZORRO && EXPERIMENTAL
 	help
 	  If you have the BSC Oktagon SCSI disk controller for the Amiga, say
 	  Y to this question.  If you're in doubt about whether you have one,
@@ -1649,7 +1651,7 @@ config OKTAGON_SCSI
 
 config ATARI_SCSI
 	tristate "Atari native SCSI support"
-	depends on ATARI && SCSI && BROKEN
+	depends on ATARI && BROKEN
 	select SCSI_SPI_ATTRS
 	---help---
 	  If you have an Atari with built-in NCR5380 SCSI controller (TT,
@@ -1701,7 +1703,7 @@ config MAC_SCSI
 
 config SCSI_MAC_ESP
 	tristate "Macintosh NCR53c9[46] SCSI"
-	depends on MAC && SCSI
+	depends on MAC
 	help
 	  This is the NCR 53c9x SCSI controller found on most of the 68040
 	  based Macintoshes.  If you have one of these say Y and read the
@@ -1721,7 +1723,7 @@ config MVME147_SCSI
 
 config MVME16x_SCSI
 	bool "NCR53C710 SCSI driver for MVME16x"
-	depends on MVME16x && SCSI && BROKEN
+	depends on MVME16x && BROKEN
 	select SCSI_SPI_ATTRS
 	help
 	  The Motorola MVME162, 166, 167, 172 and 177 boards use the NCR53C710
@@ -1730,7 +1732,7 @@ config MVME16x_SCSI
 
 config BVME6000_SCSI
 	bool "NCR53C710 SCSI driver for BVME6000"
-	depends on BVME6000 && SCSI && BROKEN
+	depends on BVME6000 && BROKEN
 	select SCSI_SPI_ATTRS
 	help
 	  The BVME4000 and BVME6000 boards from BVM Ltd use the NCR53C710
@@ -1747,7 +1749,7 @@ config SCSI_NCR53C7xx_FAST
 
 config SUN3_SCSI
 	tristate "Sun3 NCR5380 SCSI"
-	depends on SUN3 && SCSI
+	depends on SUN3
 	select SCSI_SPI_ATTRS
 	help
 	  This option will enable support for the OBIO (onboard io) NCR5380
@@ -1765,7 +1767,7 @@ config SUN3X_ESP
 
 config SCSI_SUNESP
 	tristate "Sparc ESP Scsi Driver"
-	depends on SBUS && SCSI
+	depends on SBUS
 	help
 	  This is the driver for the Sun ESP SCSI host adapter. The ESP
 	  chipset is present in most SPARC SBUS-based computers.
@@ -1777,7 +1779,7 @@ config SCSI_SUNESP
 
 config ZFCP
 	tristate "FCP host bus adapter driver for IBM eServer zSeries"
-	depends on S390 && QDIO && SCSI
+	depends on S390 && QDIO
 	select SCSI_FC_ATTRS
 	help
           If you want to access SCSI devices attached to your IBM eServer
@@ -1791,7 +1793,7 @@ config ZFCP
 
 config SCSI_SRP
 	tristate "SCSI RDMA Protocol helper library"
-	depends on SCSI && PCI
+	depends on PCI
 	select SCSI_TGT
 	help
 	  If you wish to use SRP target drivers, say Y.
@@ -1799,7 +1801,7 @@ config SCSI_SRP
 	  To compile this driver as a module, choose M here: the
 	  module will be called libsrp.
 
-endmenu
+endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"
 
Index: linux-2.6.21-rc5/drivers/scsi/aic7xxx/Kconfig.aic79xx
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ linux-2.6.21-rc5/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -4,7 +4,7 @@
 #
 config SCSI_AIC79XX
 	tristate "Adaptec AIC79xx U320 support"
-	depends on PCI && SCSI
+	depends on PCI
 	select SCSI_SPI_ATTRS
 	help
 	This driver supports all of Adaptec's Ultra 320 PCI-X
Index: linux-2.6.21-rc5/drivers/scsi/arm/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/arm/Kconfig
+++ linux-2.6.21-rc5/drivers/scsi/arm/Kconfig
@@ -3,7 +3,7 @@
 #
 config SCSI_ACORNSCSI_3
 	tristate "Acorn SCSI card (aka30) support"
-	depends on ARCH_ACORN && SCSI && BROKEN
+	depends on ARCH_ACORN && BROKEN
 	select SCSI_SPI_ATTRS
 	help
 	  This enables support for the Acorn SCSI card (aka30). If you have an
@@ -32,7 +32,7 @@ config SCSI_ACORNSCSI_SYNC
 
 config SCSI_ARXESCSI
 	tristate "ARXE SCSI support"
-	depends on ARCH_ACORN && SCSI
+	depends on ARCH_ACORN
 	help
 	  Around 1991, Arxe Systems Limited released a high density floppy
 	  disc interface for the Acorn Archimedes range, to allow the use of
@@ -44,21 +44,21 @@ config SCSI_ARXESCSI
 
 config SCSI_CUMANA_2
 	tristate "CumanaSCSI II support"
-	depends on ARCH_ACORN && SCSI
+	depends on ARCH_ACORN
 	help
 	  This enables support for the Cumana SCSI II card. If you have an
 	  Acorn system with one of these, say Y. If unsure, say N.
 
 config SCSI_EESOXSCSI
 	tristate "EESOX support"
-	depends on ARCH_ACORN && SCSI
+	depends on ARCH_ACORN
 	help
 	  This enables support for the EESOX SCSI card. If you have an Acorn
 	  system with one of these, say Y, otherwise say N.
 
 config SCSI_POWERTECSCSI
 	tristate "PowerTec support"
-	depends on ARCH_ACORN && SCSI
+	depends on ARCH_ACORN
 	help
 	  This enables support for the Powertec SCSI card on Acorn systems. If
 	  you have one of these, say Y. If unsure, say N.
@@ -68,7 +68,7 @@ comment "The following drivers are not f
 
 config SCSI_CUMANA_1
 	tristate "CumanaSCSI I support (EXPERIMENTAL)"
-	depends on ARCH_ACORN && EXPERIMENTAL && SCSI
+	depends on ARCH_ACORN && EXPERIMENTAL
 	select SCSI_SPI_ATTRS
 	help
 	  This enables support for the Cumana SCSI I card. If you have an
@@ -76,7 +76,7 @@ config SCSI_CUMANA_1
 
 config SCSI_ECOSCSI
 	tristate "EcoScsi support (EXPERIMENTAL)"
-	depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
+	depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K)
 	select SCSI_SPI_ATTRS
 	help
 	  This enables support for the EcoSCSI card -- a small card that sits
@@ -85,7 +85,7 @@ config SCSI_ECOSCSI
 
 config SCSI_OAK1
 	tristate "Oak SCSI support (EXPERIMENTAL)"
-	depends on ARCH_ACORN && EXPERIMENTAL && SCSI
+	depends on ARCH_ACORN && EXPERIMENTAL
 	select SCSI_SPI_ATTRS
 	help
 	  This enables support for the Oak SCSI card. If you have an Acorn
Index: linux-2.6.21-rc5/drivers/scsi/megaraid/Kconfig.megaraid
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/megaraid/Kconfig.megaraid
+++ linux-2.6.21-rc5/drivers/scsi/megaraid/Kconfig.megaraid
@@ -1,12 +1,12 @@
 config MEGARAID_NEWGEN
 	bool "LSI Logic New Generation RAID Device Drivers"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	LSI Logic RAID Device Drivers
 
 config MEGARAID_MM
 	tristate "LSI Logic Management Module (New Driver)"
-	depends on PCI && SCSI && MEGARAID_NEWGEN
+	depends on PCI && MEGARAID_NEWGEN
 	help
 	Management Module provides ioctl, sysfs support for LSI Logic
 	RAID controllers.
@@ -16,7 +16,7 @@ config MEGARAID_MM
 
 config MEGARAID_MAILBOX
 	tristate "LSI Logic MegaRAID Driver (New Driver)"
-	depends on PCI && SCSI && MEGARAID_MM
+	depends on PCI && MEGARAID_MM
 	help
 	List of supported controllers
 
@@ -66,7 +66,7 @@ config MEGARAID_MAILBOX
 
 config MEGARAID_LEGACY
 	tristate "LSI Logic Legacy MegaRAID Driver"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
 	and 467 SCSI host adapters. This driver also support the all U320
@@ -77,7 +77,7 @@ config MEGARAID_LEGACY
 
 config MEGARAID_SAS
 	tristate "LSI Logic MegaRAID SAS RAID Module"
-	depends on PCI && SCSI
+	depends on PCI
 	help
 	Module for LSI Logic's SAS based RAID controllers.
 	To compile this driver as a module, choose 'm' here.
Index: linux-2.6.21-rc5/drivers/scsi/pcmcia/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/pcmcia/Kconfig
+++ linux-2.6.21-rc5/drivers/scsi/pcmcia/Kconfig
@@ -2,8 +2,12 @@
 # PCMCIA SCSI adapter configuration
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n && MODULES
+	default y
+
+if SCSI_PCMCIA
 
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
@@ -80,4 +84,4 @@ config PCMCIA_SYM53C500
 	  To compile this driver as a module, choose M here: the
 	  module will be called sym53c500_cs.
 
-endmenu
+endif # SCSI_PCMCIA
Index: linux-2.6.21-rc5/drivers/scsi/qla2xxx/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/qla2xxx/Kconfig
+++ linux-2.6.21-rc5/drivers/scsi/qla2xxx/Kconfig
@@ -1,6 +1,6 @@
 config SCSI_QLA_FC
 	tristate "QLogic QLA2XXX Fibre Channel Support"
-	depends on PCI && SCSI
+	depends on PCI
 	select SCSI_FC_ATTRS
 	select FW_LOADER
 	---help---
Index: linux-2.6.21-rc5/drivers/scsi/qla4xxx/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/qla4xxx/Kconfig
+++ linux-2.6.21-rc5/drivers/scsi/qla4xxx/Kconfig
@@ -1,6 +1,6 @@
 config SCSI_QLA_ISCSI
 	tristate "QLogic ISP4XXX host adapter family support"
-	depends on PCI && SCSI && NET
+	depends on PCI && NET
 	select SCSI_ISCSI_ATTRS
 	---help---
 	This driver supports the QLogic 40xx (ISP4XXX) iSCSI host
#<EOF>

[PATCH 30/30] Use menuconfig objects - W1

[Jan Engelhardt]

Use menuconfigs instead of menus, so the whole menu can be disabled at        
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Index: linux-2.6.21-rc5/drivers/w1/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/w1/Kconfig
+++ linux-2.6.21-rc5/drivers/w1/Kconfig
@@ -1,7 +1,5 @@
-menu "Dallas's 1-wire bus"
-
-config W1
-	tristate "Dallas's 1-wire support"
+menuconfig W1
+	tristate "Dallas's 1-wire bus support"
 	---help---
 	  Dallas' 1-wire bus is useful to connect slow 1-pin devices
 	  such as iButtons and thermal sensors.
@@ -11,8 +9,10 @@ config W1
 	  This W1 support can also be built as a module.  If so, the module
 	  will be called wire.ko.
 
+if W1
+
 config W1_CON
-	depends on CONNECTOR && W1
+	depends on CONNECTOR
 	bool "Userspace communication over connector"
 	default y
 	--- help ---
@@ -26,4 +26,4 @@ config W1_CON
 source drivers/w1/masters/Kconfig
 source drivers/w1/slaves/Kconfig
 
-endmenu
+endif # W1
Index: linux-2.6.21-rc5/drivers/w1/masters/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/w1/masters/Kconfig
+++ linux-2.6.21-rc5/drivers/w1/masters/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "1-wire Bus Masters"
-	depends on W1
 
 config W1_MASTER_MATROX
 	tristate "Matrox G400 transport layer for 1-wire"
-	depends on W1 && PCI
+	depends on PCI
 	help
 	  Say Y here if you want to communicate with your 1-wire devices
 	  using Matrox's G400 GPIO pins.
@@ -17,7 +16,7 @@ config W1_MASTER_MATROX
 
 config W1_MASTER_DS2490
 	tristate "DS2490 USB <-> W1 transport layer for 1-wire"
-  	depends on W1 && USB
+  	depends on USB
   	help
 	  Say Y here if you want to have a driver for DS2490 based USB <-> W1 bridges,
 	  for example DS9490*.
@@ -27,7 +26,7 @@ config W1_MASTER_DS2490
 
 config W1_MASTER_DS2482
 	tristate "Maxim DS2482 I2C to 1-Wire bridge"
-	depends on I2C && W1 && EXPERIMENTAL
+	depends on I2C && EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Maxim DS2482
 	  I2C to 1-Wire bridge.
Index: linux-2.6.21-rc5/drivers/w1/slaves/Kconfig
===================================================================
--- linux-2.6.21-rc5.orig/drivers/w1/slaves/Kconfig
+++ linux-2.6.21-rc5/drivers/w1/slaves/Kconfig
@@ -3,25 +3,21 @@
 #
 
 menu "1-wire Slaves"
-	depends on W1
 
 config W1_SLAVE_THERM
 	tristate "Thermal family implementation"
-	depends on W1
 	help
 	  Say Y here if you want to connect 1-wire thermal sensors to your
 	  wire.
 
 config W1_SLAVE_SMEM
 	tristate "Simple 64bit memory family implementation"
-	depends on W1
 	help
 	  Say Y here if you want to connect 1-wire
 	  simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire.
 
 config W1_SLAVE_DS2433
 	tristate "4kb EEPROM family support (DS2433)"
-	depends on W1
 	help
 	  Say Y here if you want to use a 1-wire
 	  4kb EEPROM family device (DS2433).
#<EOF>

Re: [PATCH 0/30] Use menuconfig objects

[Stefan Richter]

Jan Engelhardt wrote:
> the following patch series turns some menus into menuconfigs, so they 
> can be disabled whilst "walking" thorugh the parent menu (check the 
> videos [1], [2] to see what I mean), enabling for disabling lots of 
> options _quickly_.
> 
> I'll send the patches (as a reply to this mail) piece by piece out
> when I figure out the maintainers to Cc for each.
> 
> [1] 6.04 MB(1000s) 70 sec http://jengelh.hopto.org/mc/without.ogg
> [2] 1.96 MB(1000s) 44 sec http://jengelh.hopto.org/mc/with.ogg
> (Ogg container, Theora Video, no audio)
> 
> I have not poked on all subsystems (it is quite a lot), but I can 
> already give a glimpse (`ls -1`) of who gets one and who does not.
> And, I am not completely finished changing some subsystems - but
> the patches are already big enough for a first wave. I want to get
> some feedback first. Thanks!

I haven't watched your videos yet but I tried one of the patches
  - with make xconfig: OK
  - with make gconfig: OK
  - with make menuconfig: less so, because:
When one switches a menuconfig _on_, one might miss that there are
subsequent options to configure.  (Although the availability of further
options is indicated by the '--->' suffix to the menu title.)
-- 
Stefan Richter
-=====-=-=== -=-- -=-=-
http://arcgraph.de/sr/

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On Apr 11 2007 00:04, Stefan Richter wrote:
>
>[...] I tried one of the patches
>  - with make xconfig: OK
>  - with make gconfig: OK
>  - with make menuconfig: less so, because:
>When one switches a menuconfig _on_, one might miss that there are
>subsequent options to configure.  (Although the availability of further
>options is indicated by the '--->' suffix to the menu title.)

The kconfig files had some menuconfigs for some time (CONFIG_EMBEDDED to be
one). I do not think these menu entry types are unknown.

Jan
-- 

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Stefan Richter]

Jan Engelhardt wrote:
> Use menuconfigs instead of menus, so the whole menu can be disabled at        
> once instead of going through all options.

If you excuse the nitpicking:  The patch description is not very
precise.  You don't have to go through all options in the IEEE 1394 menu
if you don't need them.  Once the first entry in the menu is disabled,
all other options vanish.  (Of course with your patch you don't have to
enter the submenu in the first place if you switch it off.)  I suppose
it's the same with some more of the menus you edited.

But even though, keeping such groups of options in a menu _without_ the
possibility to switch the menu off helps to focus on these options.
Less clutter in the display one is working with in a moment.  IMO,
kernel configuration is not a sport where speed matters but a task where
we want to present the user a very cleaned-up, calm display.

In general though, I'm impartial on this kind of change.

> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> 
> Index: linux-2.6.21-rc5/drivers/ieee1394/Kconfig
> ===================================================================
> --- linux-2.6.21-rc5.orig/drivers/ieee1394/Kconfig
> +++ linux-2.6.21-rc5/drivers/ieee1394/Kconfig
> @@ -1,8 +1,6 @@
>  # -*- shell-script -*-
>  
> -menu "IEEE 1394 (FireWire) support"
> -
> -config IEEE1394
> +menuconfig IEEE1394
>  	tristate "IEEE 1394 (FireWire) support"
>  	depends on PCI || BROKEN
>  	select NET
> @@ -19,12 +17,12 @@ config IEEE1394

[...]

For the readers of linux1394-devel:

Jan Engelhardt wrote at lkml:
Subject: [PATCH 0/30] Use menuconfig objects
> Hello list,
>
>
> the following patch series turns some menus into menuconfigs, so they
> can be disabled whilst "walking" thorugh the parent menu (check the
> videos [1], [2] to see what I mean), enabling for disabling lots of
> options _quickly_.
>
> I'll send the patches (as a reply to this mail) piece by piece out
> when I figure out the maintainers to Cc for each.
>
> [1] 6.04 MB(1000s) 70 sec http://jengelh.hopto.org/mc/without.ogg
> [2] 1.96 MB(1000s) 44 sec http://jengelh.hopto.org/mc/with.ogg
> (Ogg container, Theora Video, no audio)
>
> I have not poked on all subsystems (it is quite a lot), but I can
> already give a glimpse (`ls -1`) of who gets one and who does not.
> And, I am not completely finished changing some subsystems - but
> the patches are already big enough for a first wave. I want to get
> some feedback first. Thanks!
>


-- 
Stefan Richter
-=====-=-=== -=-- -=-==
http://arcgraph.de/sr/

Re: [PATCH 0/30] Use menuconfig objects

[Stefan Richter]

David Lang wrote:
> On Wed, 11 Apr 2007, Stefan Richter wrote:
>>  - with make xconfig: OK
>>  - with make gconfig: OK
>>  - with make menuconfig: less so, because:
>> When one switches a menuconfig _on_, one might miss that there are
>> subsequent options to configure.  (Although the availability of further
>> options is indicated by the '--->' suffix to the menu title.)
> 
> I use menuconfig almost excludively, there are already quite a few cases
> where the menuconfig is used, so you already need to watch out for the
> '--->' when you turn it on.

OK.

> I haven't applied this patch series, but I definantly like the concept.
> I spend a _lot_ of time with a new kernel going through and entering
> menus for the sole purpose of disabling everything in them, being able
> to do so from the level above would be nice.
...

Actually, people who configure a kernel less than twice a year should be
first heard on these matters. :-) You won't find many of those people
here on LKML though.
-- 
Stefan Richter
-=====-=-=== -=-- -=-==
http://arcgraph.de/sr/

Re: [PATCH 0/30] Use menuconfig objects

[Adrian Bunk]

On Wed, Apr 11, 2007 at 12:09:01AM +0200, Jan Engelhardt wrote:
> 
> On Apr 11 2007 00:04, Stefan Richter wrote:
> >
> >[...] I tried one of the patches
> >  - with make xconfig: OK
> >  - with make gconfig: OK
> >  - with make menuconfig: less so, because:
> >When one switches a menuconfig _on_, one might miss that there are
> >subsequent options to configure.  (Although the availability of further
> >options is indicated by the '--->' suffix to the menu title.)
> 
> The kconfig files had some menuconfigs for some time (CONFIG_EMBEDDED to be
> one). I do not think these menu entry types are unknown.

And the EMBEDDED menu has the interesting property that it's not empty 
with CONFIG_EMBEDDED=n .

> Jan

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH 17/30] Use menuconfig objects - IPVS

[Simon Horman]

On Tue, Apr 10, 2007 at 11:25:59PM +0200, Jan Engelhardt wrote:
> 
> Use menuconfigs instead of menus, so the whole menu can be disabled at        
> once instead of going through all options.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

This seems to work fine to me.

Signed-off-by: Simon Horman <horms@verge.net.au>

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/

Re: [PATCH 0/30] Use menuconfig objects

[Robert P. J. Day]

On Wed, 11 Apr 2007, Adrian Bunk wrote:

> On Wed, Apr 11, 2007 at 12:09:01AM +0200, Jan Engelhardt wrote:
> >
> > On Apr 11 2007 00:04, Stefan Richter wrote:
> > >
> > >[...] I tried one of the patches
> > >  - with make xconfig: OK
> > >  - with make gconfig: OK
> > >  - with make menuconfig: less so, because:
> > >When one switches a menuconfig _on_, one might miss that there are
> > >subsequent options to configure.  (Although the availability of further
> > >options is indicated by the '--->' suffix to the menu title.)
> >
> > The kconfig files had some menuconfigs for some time
> > (CONFIG_EMBEDDED to be one). I do not think these menu entry types
> > are unknown.
>
> And the EMBEDDED menu has the interesting property that it's not
> empty with CONFIG_EMBEDDED=n .

that entire "Embedded" submenu is a hideous mis-design, as selecting
it simply presents you with options you can now "*de-select*.  that is
*anything* but intuitive.

rday
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================

Re: [PATCH 05/30] Use menuconfig objects - connector

[Evgeniy Polyakov]

On Tue, Apr 10, 2007 at 09:53:29PM +0200, Jan Engelhardt (jengelh@linux01.gwdg.de) wrote:
> 
> Use menuconfigs instead of menus, so the whole menu can be disabled at        
> once instead of going through all options.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

I have no objections against both connector and w1 changes, feel free to
add my acked-by.
I can push that changes upstream if they will not be picked up as a one
set.

Thanks, Jan.

-- 
	Evgeniy Polyakov

Re: [PATCH 24/30] Use menuconfig objects - oldcd

[Jan Engelhardt]

Hi Andrew,


On Apr 10 2007 23:37, Jan Engelhardt wrote:
>Date: Tue, 10 Apr 2007 23:37:42 +0200 (MEST)
>From: Jan Engelhardt <jengelh@.>
>To: Eberhard Mönkeberg <emoenke@.>
>Cc: Linux Kernel Mailing List <linux-kernel@.>,
>    Andrew Morton <akpm@.>
>Subject: [PATCH 24/30] Use menuconfig objects - oldcd

There seems to be no maintainer for the oldcd 
subsystem (specifically drivers/cdrom/Kconfig).
Any hints who should get it, or would you take care of it?


Thanks,
Jan
-- 

Re: [PATCH 24/30] Use menuconfig objects - oldcd

[Andrew Morton]

On Wed, 11 Apr 2007 09:55:49 +0200 (MEST) Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> Hi Andrew,
> 
> 
> On Apr 10 2007 23:37, Jan Engelhardt wrote:
> >Date: Tue, 10 Apr 2007 23:37:42 +0200 (MEST)
> >From: Jan Engelhardt <jengelh@.>
> >To: Eberhard Mönkeberg <emoenke@.>
> >Cc: Linux Kernel Mailing List <linux-kernel@.>,
> >    Andrew Morton <akpm@.>
> >Subject: [PATCH 24/30] Use menuconfig objects - oldcd
> 
> There seems to be no maintainer for the oldcd 
> subsystem (specifically drivers/cdrom/Kconfig).

Nominally axboe.

> Any hints who should get it, or would you take care of it?

Send it to me.  Send everything to me, if you actually want it applied :(

I'll get this stuff off lkml, when I get that far.

Re: [PATCH 10/30] Use menuconfig objects - I2C

[Jean Delvare]

Hi Jan,

On Tue, 10 Apr 2007 23:11:41 +0200 (MEST), Jan Engelhardt wrote:
> 
> Use menuconfigs instead of menus, so the whole menu can be disabled at        
> once instead of going through all options.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Well, in practice it was already possible to disable all I2C options at
once. The real difference is that it's now done directly from the main
Device Drivers menu. And we no longer have to express the dependency on
I2C in each Kconfig entry, which is nice.

The patch looks OK to me, except that it needs to be adjusted for the
current state of the i2c subsystem. This kind of patch should be built
on top on Andrew Morton's latest tree, not Linus Torvalds'.

What is the merge plan?

-- 
Jean Delvare

Re: [PATCH 20/30] Use menuconfig objects - ARCNET

[Esben Nielsen]

On Tue, 10 Apr 2007, Jan Engelhardt wrote:

>
> (Wow, not a single MODULE_AUTHOR line in drivers/net/arcnet/ ...)


ArcNet is old. Almost nobody is using it anymore. I used it at my former 
job, since we used it as control network. A lot of companies still does 
quitely, but not in combination with Linux.

>
> Use menuconfigs instead of menus, so the whole menu can be disabled at
> once instead of going through all options.
>
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
>
> Index: linux-2.6.21-rc5/drivers/net/arcnet/Kconfig
> ===================================================================
> --- linux-2.6.21-rc5.orig/drivers/net/arcnet/Kconfig
> +++ linux-2.6.21-rc5/drivers/net/arcnet/Kconfig
> @@ -2,10 +2,8 @@
> # Arcnet configuration
> #
>
> -menu "ARCnet devices"
> +menuconfig ARCNET
> 	depends on NETDEVICES && (ISA || PCI)

Why does it depend on ISA || PCI ? People tend to forget the PCMCIA 
driver. And in principle you could enable the ArcNet framework without 
using any of the drivers in the kernel tree.


Esben

Re: [PATCH 10/30] Use menuconfig objects - I2C

[Jan Engelhardt]

Hi Jean,


On Apr 11 2007 10:14, Jean Delvare wrote:
>On Tue, 10 Apr 2007 23:11:41 +0200 (MEST), Jan Engelhardt wrote:
>> 
>> Use menuconfigs instead of menus, so the whole menu can be disabled at        
>> once instead of going through all options.
>> 
>> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
>
>The patch looks OK to me, except that it needs to be adjusted for the
>current state of the i2c subsystem. This kind of patch should be built
>on top on Andrew Morton's latest tree, not Linus Torvalds'.
>
>What is the merge plan?

If it applies with not too many rejects, take it and fixup
potentially new config options.
Else
  If Andrew's latest is a tarball or some sort of file (it is),
  I can redo it (with a big grumpy face ;-)
  Else
    You have to do it.

I think that's the typical way of doing things.
Documentation/SubmittingPatches only mandates latest kernel version 
(which most likely means Linus's tree), I could rebase.

Thanks,
Jan
-- 

Re: [PATCH 20/30] Use menuconfig objects - ARCNET

[Jan Engelhardt]

On Apr 11 2007 10:30, Esben Nielsen wrote:
> On Tue, 10 Apr 2007, Jan Engelhardt wrote:
>> 
>> (Wow, not a single MODULE_AUTHOR line in drivers/net/arcnet/ ...)
>
> ArcNet is old. Almost nobody is using it anymore. I used it at my
> former job, since we used it as control network. A lot of companies
> still does quitely, but not in combination with Linux.

So send some removal patches :)

>> 
>> -menu "ARCnet devices"
>> +menuconfig ARCNET
>> depends on NETDEVICES && (ISA || PCI)
>
> Why does it depend on ISA || PCI ?

No idea. I just left it as is.

> People tend to forget the PCMCIA driver.

Somewhat somewhat. 32-bit PCMCIA (CONFIG_CARDBUS) depends on PCI,
so with (ISA || PCI) you have probably everything minus
{sbus, mca, 16 bit pcmcia, other exotic parts}.

> And in principle you could enable the ArcNet framework
> without using any of the drivers in the kernel tree.


Jan
-- 

Re: [PATCH 20/30] Use menuconfig objects - ARCNET

[Esben Nielsen]

On Wed, 11 Apr 2007, Jan Engelhardt wrote:

>
> On Apr 11 2007 10:30, Esben Nielsen wrote:
>> On Tue, 10 Apr 2007, Jan Engelhardt wrote:
>>>
>>> (Wow, not a single MODULE_AUTHOR line in drivers/net/arcnet/ ...)
>>
>> ArcNet is old. Almost nobody is using it anymore. I used it at my
>> former job, since we used it as control network. A lot of companies
>> still does quitely, but not in combination with Linux.

Let me correct myself: I have only know of one company using the Linux 
ArcNet combination in production. But there must be other companies using 
ArcNet playing with Linux in R&D.

>
> So send some removal patches :)

No. Somebody (like me) in those companise use them sporadically for their 
PCI/PCMCIA cards. The vendor have some basic Windoze drives. Missing Linux 
drivers should not be yet another obstacle for using Linux.

They might also one day want to run Linux on their embedded platform - 
especially with preempt-realtime. When I at my former job got Linux to boot
at our embedded platform their I could almost immediately use the onboard
ArcNet controller. For the propriatary OS otherwise used on those platforms it
took many man weeks to write a driver.

Keeping support for old devices in the kernel tree is a good for Linux. It 
should take too long updating it for API changes and although they might 
not work, but if the occational user is capable enough, he can soon fix 
them. If they are are removed the occational user will choose another OS.

Esben

Re: [PATCH 10/30 #2] Use menuconfig objects - I2C

[Jan Engelhardt]

>On Apr 11 2007 10:14, Jean Delvare wrote:
>>On Tue, 10 Apr 2007 23:11:41 +0200 (MEST), Jan Engelhardt wrote:
>>> 
>>> Use menuconfigs instead of menus, so the whole menu can be disabled at        
>>> once instead of going through all options.
>>
>>The patch looks OK to me, except that it needs to be adjusted for the
>>current state of the i2c subsystem. This kind of patch should be built
>>on top on Andrew Morton's latest tree, not Linus Torvalds'.
>>
>>What is the merge plan?

This is the plan:


Allow the whole I2C menu to be disabled at once without diving into
the submenus for deselecting all options (should the user desire so).

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

 Kconfig        |   15 ++-------
 algos/Kconfig  |    8 +---
 busses/Kconfig |   93 +++++++++++++++++++++++++++------------------------------
 chips/Kconfig  |   23 ++++++--------
 4 files changed, 62 insertions(+), 77 deletions(-)

Index: linux-2.6.21-rc6-mm1/drivers/i2c/Kconfig
===================================================================
--- linux-2.6.21-rc6-mm1.orig/drivers/i2c/Kconfig
+++ linux-2.6.21-rc6-mm1/drivers/i2c/Kconfig
@@ -2,9 +2,7 @@
 # I2C subsystem configuration
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
 	  I2C (pronounce: I-square-C) is a slow serial bus protocol used in
@@ -22,14 +20,14 @@ config I2C
 	  This I2C support can also be built as a module.  If so, the module
 	  will be called i2c-core.
 
+if I2C
+
 config I2C_BOARDINFO
 	boolean
-	depends on I2C
 	default y
 
 config I2C_CHARDEV
 	tristate "I2C device interface"
-	depends on I2C
 	help
 	  Say Y here to use i2c-* device files, usually found in the /dev
 	  directory on your system.  They make it possible to have user-space
@@ -45,7 +43,6 @@ source drivers/i2c/chips/Kconfig
 
 config I2C_DEBUG_CORE
 	bool "I2C Core debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C core to produce a bunch of debug
 	  messages to the system log.  Select this if you are having a
@@ -53,7 +50,6 @@ config I2C_DEBUG_CORE
 
 config I2C_DEBUG_ALGO
 	bool "I2C Algorithm debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C algorithm drivers to produce a bunch
 	  of debug messages to the system log.  Select this if you are having
@@ -62,7 +58,6 @@ config I2C_DEBUG_ALGO
 
 config I2C_DEBUG_BUS
 	bool "I2C Bus debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C bus drivers to produce a bunch of
 	  debug messages to the system log.  Select this if you are having
@@ -71,12 +66,10 @@ config I2C_DEBUG_BUS
 
 config I2C_DEBUG_CHIP
 	bool "I2C Chip debugging messages"
-	depends on I2C
 	help
 	  Say Y here if you want the I2C chip drivers to produce a bunch of
 	  debug messages to the system log.  Select this if you are having
 	  a problem with I2C support and want to see more of what is going
 	  on.
 
-endmenu
-
+endif # I2C
Index: linux-2.6.21-rc6-mm1/drivers/i2c/algos/Kconfig
===================================================================
--- linux-2.6.21-rc6-mm1.orig/drivers/i2c/algos/Kconfig
+++ linux-2.6.21-rc6-mm1/drivers/i2c/algos/Kconfig
@@ -3,11 +3,9 @@
 #
 
 menu "I2C Algorithms"
-	depends on I2C
 
 config I2C_ALGOBIT
 	tristate "I2C bit-banging interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called bit-banging
 	  adapters.  Say Y if you own an I2C adapter belonging to this class
@@ -18,7 +16,6 @@ config I2C_ALGOBIT
 
 config I2C_ALGOPCF
 	tristate "I2C PCF 8584 interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called PCF adapters.
 	  Say Y if you own an I2C adapter belonging to this class and then say
@@ -29,7 +26,6 @@ config I2C_ALGOPCF
 
 config I2C_ALGOPCA
 	tristate "I2C PCA 9564 interfaces"
-	depends on I2C
 	help
 	  This allows you to use a range of I2C adapters called PCA adapters.
 	  Say Y if you own an I2C adapter belonging to this class and then say
@@ -40,11 +36,11 @@ config I2C_ALGOPCA
 
 config I2C_ALGO8XX
 	tristate "MPC8xx CPM I2C interface"
-	depends on 8xx && I2C
+	depends on 8xx
 
 config I2C_ALGO_SGI
 	tristate "I2C SGI interfaces"
-	depends on I2C && (SGI_IP22 || SGI_IP32 || X86_VISWS)
+	depends on SGI_IP22 || SGI_IP32 || X86_VISWS
 	help
 	  Supports the SGI interfaces like the ones found on SGI Indy VINO
 	  or SGI O2 MACE.
Index: linux-2.6.21-rc6-mm1/drivers/i2c/busses/Kconfig
===================================================================
--- linux-2.6.21-rc6-mm1.orig/drivers/i2c/busses/Kconfig
+++ linux-2.6.21-rc6-mm1/drivers/i2c/busses/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "I2C Hardware Bus support"
-	depends on I2C
 
 config I2C_ALI1535
 	tristate "ALI 1535"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -19,7 +18,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
 	tristate "ALI 1563"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -31,7 +30,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
 	tristate "ALI 15x3"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the
 	  Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +40,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
 	tristate "AMD 756/766/768/8111 and nVidia nForce"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the AMD
 	  756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -66,7 +65,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
 	tristate "AMD 8111"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the
 	  second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -76,14 +75,14 @@ config I2C_AMD8111
 
 config I2C_AT91
 	tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
-	depends on I2C && ARCH_AT91 && EXPERIMENTAL
+	depends on ARCH_AT91 && EXPERIMENTAL
 	help
 	  This supports the use of the I2C interface on Atmel AT91
 	  processors.
 
 config I2C_AU1550
 	tristate "Au1550/Au1200 SMBus interface"
-	depends on I2C && (SOC_AU1550 || SOC_AU1200)
+	depends on SOC_AU1550 || SOC_AU1200
 	help
 	  If you say yes to this option, support will be included for the
 	  Au1550 and Au1200 SMBus interface.
@@ -93,7 +92,7 @@ config I2C_AU1550
 
 config I2C_BLACKFIN_TWI
 	tristate "Blackfin TWI I2C support"
-	depends on I2C && (BF534 || BF536 || BF537)
+	depends on BF534 || BF536 || BF537
 	help
 	  This is the TWI I2C device driver for Blackfin 534/536/537.
 	  This driver can also be built as a module.  If so, the module
@@ -109,7 +108,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
 
 config I2C_ELEKTOR
 	tristate "Elektor ISA card"
-	depends on I2C && ISA && BROKEN_ON_SMP
+	depends on ISA && BROKEN_ON_SMP
 	select I2C_ALGOPCF
 	help
 	  This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
@@ -120,7 +119,7 @@ config I2C_ELEKTOR
 
 config I2C_HYDRA
 	tristate "CHRP Apple Hydra Mac I/O I2C interface"
-	depends on I2C && PCI && PPC_CHRP && EXPERIMENTAL
+	depends on PCI && PPC_CHRP && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  This supports the use of the I2C interface in the Apple Hydra Mac
@@ -132,7 +131,7 @@ config I2C_HYDRA
 
 config I2C_I801
 	tristate "Intel 82801 (ICH)"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  801 family of mainboard I2C interfaces.  Specifically, the following
@@ -155,7 +154,7 @@ config I2C_I801
 
 config I2C_I810
 	tristate "Intel 810/815"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the Intel
@@ -172,7 +171,7 @@ config I2C_I810
 
 config I2C_PXA
 	tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
-	depends on I2C && EXPERIMENTAL && ARCH_PXA
+	depends on EXPERIMENTAL && ARCH_PXA
 	help
 	  If you have devices in the PXA I2C bus, say yes to this option.
 	  This driver can also be built as a module.  If so, the module
@@ -188,7 +187,7 @@ config I2C_PXA_SLAVE
 
 config I2C_PIIX4
 	tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  PIIX4 family of mainboard I2C interfaces.  Specifically, the following
@@ -211,7 +210,7 @@ config I2C_PIIX4
 
 config I2C_IBM_IIC
 	tristate "IBM PPC 4xx on-chip I2C interface"
-	depends on IBM_OCP && I2C
+	depends on IBM_OCP
 	help
 	  Say Y here if you want to use IIC peripheral found on 
 	  embedded IBM PPC 4xx based systems. 
@@ -221,7 +220,7 @@ config I2C_IBM_IIC
 
 config I2C_IOP3XX
 	tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
-	depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
+	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
 	help
 	  Say Y here if you want to use the IIC bus controller on
 	  the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
@@ -231,11 +230,10 @@ config I2C_IOP3XX
 
 config I2C_ISA
 	tristate
-	depends on I2C
 
 config I2C_IXP4XX
 	tristate "IXP4xx GPIO-Based I2C Interface"
-	depends on I2C && ARCH_IXP4XX
+	depends on ARCH_IXP4XX
 	select I2C_ALGOBIT
 	help
 	  Say Y here if you have an Intel IXP4xx(420,421,422,425) based 
@@ -246,7 +244,7 @@ config I2C_IXP4XX
 
 config I2C_IXP2000
 	tristate "IXP2000 GPIO-Based I2C Interface"
-	depends on I2C && ARCH_IXP2000
+	depends on ARCH_IXP2000
 	select I2C_ALGOBIT
 	help
 	  Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based 
@@ -257,7 +255,7 @@ config I2C_IXP2000
 
 config I2C_POWERMAC
 	tristate "Powermac I2C interface"
-	depends on I2C && PPC_PMAC
+	depends on PPC_PMAC
 	default y
 	help
 	  This exposes the various PowerMac i2c interfaces to the linux i2c
@@ -269,7 +267,7 @@ config I2C_POWERMAC
 
 config I2C_MPC
 	tristate "MPC107/824x/85xx/52xx/86xx"
-	depends on I2C && PPC32
+	depends on PPC32
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
@@ -281,7 +279,7 @@ config I2C_MPC
 
 config I2C_NFORCE2
 	tristate "Nvidia nForce2, nForce3 and nForce4"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the Nvidia
 	  nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
@@ -291,7 +289,7 @@ config I2C_NFORCE2
 
 config I2C_OCORES
 	tristate "OpenCores I2C Controller"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  OpenCores I2C controller. For details see
@@ -302,7 +300,7 @@ config I2C_OCORES
 
 config I2C_OMAP
 	tristate "OMAP I2C adapter"
-	depends on I2C && ARCH_OMAP
+	depends on ARCH_OMAP
 	default y if MACH_OMAP_H3 || MACH_OMAP_OSK
 	help
 	  If you say yes to this option, support will be included for the
@@ -312,7 +310,7 @@ config I2C_OMAP
 
 config I2C_PARPORT
 	tristate "Parallel port adapter"
-	depends on I2C && PARPORT
+	depends on PARPORT
 	select I2C_ALGOBIT
 	help
 	  This supports parallel port I2C adapters such as the ones made by
@@ -336,7 +334,6 @@ config I2C_PARPORT
 
 config I2C_PARPORT_LIGHT
 	tristate "Parallel port adapter (light)"
-	depends on I2C
 	select I2C_ALGOBIT
 	help
 	  This supports parallel port I2C adapters such as the ones made by
@@ -360,14 +357,14 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PASEMI
 	tristate "PA Semi SMBus interface"
-#	depends on PPC_PASEMI && I2C && PCI
-	depends on I2C && PCI
+#	depends on PPC_PASEMI && PCI
+	depends on PCI
 	help
 	  Supports the PA Semi PWRficient on-chip SMBus interfaces.
 
 config I2C_PROSAVAGE
 	tristate "S3/VIA (Pro)Savage"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the
@@ -382,19 +379,19 @@ config I2C_PROSAVAGE
 
 config I2C_RPXLITE
 	tristate "Embedded Planet RPX Lite/Classic support"
-	depends on (RPXLITE || RPXCLASSIC) && I2C
+	depends on RPXLITE || RPXCLASSIC
 	select I2C_ALGO8XX
 
 config I2C_S3C2410
 	tristate "S3C2410 I2C Driver"
-	depends on I2C && ARCH_S3C2410
+	depends on ARCH_S3C2410
 	help
 	  Say Y here to include support for I2C controller in the
 	  Samsung S3C2410 based System-on-Chip devices.
 
 config I2C_SAVAGE4
 	tristate "S3 Savage 4"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the 
@@ -405,13 +402,13 @@ config I2C_SAVAGE4
 
 config I2C_SIBYTE
 	tristate "SiByte SMBus interface"
-	depends on SIBYTE_SB1xxx_SOC && I2C
+	depends on SIBYTE_SB1xxx_SOC
 	help
 	  Supports the SiByte SOC on-chip I2C interfaces (2 channels).
 
 config SCx200_I2C
 	tristate "NatSemi SCx200 I2C using GPIO pins"
-	depends on SCx200_GPIO && I2C
+	depends on SCx200_GPIO
 	select I2C_ALGOBIT
 	help
 	  Enable the use of two GPIO pins of a SCx200 processor as an I2C bus.
@@ -439,7 +436,7 @@ config SCx200_I2C_SDA
 
 config SCx200_ACB
 	tristate "Geode ACCESS.bus support"
-	depends on X86_32 && I2C && PCI
+	depends on X86_32 && PCI
 	help
 	  Enable the use of the ACCESS.bus controllers on the Geode SCx200 and
 	  SC1100 processors and the CS5535 and CS5536 Geode companion devices.
@@ -451,7 +448,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
 	tristate "SiS 5595"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS5595 SMBus (a subset of I2C) interface.
@@ -461,7 +458,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
 	tristate "SiS 630/730"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -471,7 +468,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
 	tristate "SiS 96x"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the SiS
 	  96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -489,7 +486,7 @@ config I2C_SIS96X
 
 config I2C_STUB
 	tristate "I2C/SMBus Test Stub"
-	depends on I2C && EXPERIMENTAL && 'm'
+	depends on EXPERIMENTAL && m
 	default 'n'
 	help
 	  This module may be useful to developers of SMBus client drivers,
@@ -502,7 +499,7 @@ config I2C_STUB
 
 config I2C_VERSATILE
 	tristate "ARM Versatile/Realview I2C bus support"
-	depends on I2C && (ARCH_VERSATILE || ARCH_REALVIEW)
+	depends on ARCH_VERSATILE || ARCH_REALVIEW
 	select I2C_ALGOBIT
 	help
 	  Say yes if you want to support the I2C serial bus on ARMs Versatile
@@ -513,7 +510,7 @@ config I2C_VERSATILE
 
 config I2C_ACORN
 	bool "Acorn IOC/IOMD I2C bus support"
-	depends on I2C && ARCH_ACORN
+	depends on ARCH_ACORN
 	default y
 	select I2C_ALGOBIT
 	help
@@ -523,7 +520,7 @@ config I2C_ACORN
 
 config I2C_VIA
 	tristate "VIA 82C586B"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the VIA
@@ -534,7 +531,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
 	tristate "VIA VT82C596/82C686/82xx and CX700"
-	depends on I2C && PCI
+	depends on PCI
 	help
 	  If you say yes to this option, support will be included for the VIA
 	  VT82C596 and later SMBus interface.  Specifically, the following
@@ -553,7 +550,7 @@ config I2C_VIAPRO
 
 config I2C_VOODOO3
 	tristate "Voodoo 3"
-	depends on I2C && PCI
+	depends on PCI
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the
@@ -564,7 +561,7 @@ config I2C_VOODOO3
 
 config I2C_PCA_ISA
 	tristate "PCA9564 on an ISA bus"
-	depends on I2C && ISA
+	depends on ISA
 	select I2C_ALGOPCA
 	default n
 	help
@@ -581,7 +578,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
 	tristate "Marvell mv64xxx I2C Controller"
-	depends on I2C && MV64X60 && EXPERIMENTAL
+	depends on MV64X60 && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in I2C interface on the Marvell 64xxx line of host bridges.
@@ -591,7 +588,7 @@ config I2C_MV64XXX
 
 config I2C_PNX
 	tristate "I2C bus support for Philips PNX targets"
-	depends on ARCH_PNX4008 && I2C
+	depends on ARCH_PNX4008
 	help
 	  This driver supports the Philips IP3204 I2C IP block master and/or
 	  slave controller
Index: linux-2.6.21-rc6-mm1/drivers/i2c/chips/Kconfig
===================================================================
--- linux-2.6.21-rc6-mm1.orig/drivers/i2c/chips/Kconfig
+++ linux-2.6.21-rc6-mm1/drivers/i2c/chips/Kconfig
@@ -3,11 +3,10 @@
 #
 
 menu "Miscellaneous I2C Chip support"
-	depends on I2C
 
 config SENSORS_DS1337
 	tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS1337 and DS1339 real-time clock chips.
@@ -17,7 +16,7 @@ config SENSORS_DS1337
 
 config SENSORS_DS1374
 	tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS1374 real-time clock chips.
@@ -27,7 +26,7 @@ config SENSORS_DS1374
 
 config SENSORS_EEPROM
 	tristate "EEPROM reader"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get read-only access to the EEPROM data
 	  available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -38,7 +37,7 @@ config SENSORS_EEPROM
 
 config SENSORS_PCF8574
 	tristate "Philips PCF8574 and PCF8574A"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default n
 	help
 	  If you say yes here you get support for Philips PCF8574 and 
@@ -52,7 +51,7 @@ config SENSORS_PCF8574
 
 config SENSORS_PCA9539
 	tristate "Philips PCA9539 16-bit I/O port"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Philips PCA9539
 	  16-bit I/O port.
@@ -62,7 +61,7 @@ config SENSORS_PCA9539
 
 config SENSORS_PCF8591
 	tristate "Philips PCF8591"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default n
 	help
 	  If you say yes here you get support for Philips PCF8591 chips.
@@ -75,7 +74,7 @@ config SENSORS_PCF8591
 
 config ISP1301_OMAP
 	tristate "Philips ISP1301 with OMAP OTG"
-	depends on I2C && ARCH_OMAP_OTG
+	depends on ARCH_OMAP_OTG
 	help
 	  If you say yes here you get support for the Philips ISP1301
 	  USB-On-The-Go transceiver working with the OMAP OTG controller.
@@ -90,7 +89,7 @@ config ISP1301_OMAP
 # and having mostly OMAP-specific board support
 config TPS65010
 	tristate "TPS6501x Power Management chips"
-	depends on I2C && ARCH_OMAP
+	depends on ARCH_OMAP
 	default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
 	help
 	  If you say yes here you get support for the TPS6501x series of
@@ -103,7 +102,7 @@ config TPS65010
 
 config SENSORS_M41T00
 	tristate "ST M41T00 RTC chip"
-	depends on I2C && PPC32
+	depends on PPC32
 	help
 	  If you say yes here you get support for the ST M41T00 RTC chip.
 
@@ -112,7 +111,7 @@ config SENSORS_M41T00
 
 config SENSORS_MAX6875
 	tristate "Maxim MAX6875 Power supply supervisor"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Maxim MAX6875
 	  EEPROM-programmable, quad power-supply sequencer/supervisor.
@@ -127,7 +126,7 @@ config SENSORS_MAX6875
 
 config SENSORS_TSL2550
 	tristate "Taos TSL2550 ambient light sensor"
-	depends on I2C && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say yes here you get support for the Taos TSL2550
 	  ambient light sensor.
#<EOF>

Re: [PATCH 24/30] Use menuconfig objects - oldcd

[Stefan Richter]

Andrew Morton wrote:
> On Wed, 11 Apr 2007 09:55:49 +0200 (MEST) Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>> Any hints who should get it, or would you take care of it?
> 
> Send it to me.  Send everything to me, if you actually want it applied :(
> 
> I'll get this stuff off lkml, when I get that far.

I can handle part 13/30 IEEE1394 for you if I get told that it's good to
go upstream.

drivers/ieee1394/Kconfig in -mm will continue to differ from the one in
Linus' tree for quite a while.  You won't have fun with it.
-- 
Stefan Richter
-=====-=-=== -=-- -=-==
http://arcgraph.de/sr/

Re: [PATCH 0/30] Use menuconfig objects

[Andrew Morton]

On Tue, 10 Apr 2007 21:17:40 +0200 (MEST)
Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> the following patch series turns some menus into menuconfigs, so they 
> can be disabled whilst "walking" thorugh the parent menu

So I merged the 23 of these which survived review and which do not
intersect with other outstanding work.

I don't think I have an opinion on whether the change is actually an
improvement, and I don't get a clear sense of what others think.  Shrug.

If we're going to make this change, we should ensure that it is done
kernel-wide, for UI consistency reasons.

If nothing else happens, I guess I'll spray these patches at the relevant
maintainers in a couple of weeks time, see what sticks.

Re: [PATCH 0/30] Use menuconfig objects

[Randy Dunlap]

On Thu, 12 Apr 2007 15:50:12 -0700 Andrew Morton wrote:

> On Tue, 10 Apr 2007 21:17:40 +0200 (MEST)
> Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
> 
> > the following patch series turns some menus into menuconfigs, so they 
> > can be disabled whilst "walking" thorugh the parent menu
> 
> So I merged the 23 of these which survived review and which do not
> intersect with other outstanding work.
> 
> I don't think I have an opinion on whether the change is actually an
> improvement, and I don't get a clear sense of what others think.  Shrug.

I like them, but then I have made & sent similar patches in the past.


> If we're going to make this change, we should ensure that it is done
> kernel-wide, for UI consistency reasons.
> 
> If nothing else happens, I guess I'll spray these patches at the relevant
> maintainers in a couple of weeks time, see what sticks.


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

Hi,

On Apr 12 2007 15:50, Andrew Morton wrote:
>On Tue, 10 Apr 2007 21:17:40 +0200 (MEST)
>Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>
>> the following patch series turns some menus into menuconfigs, so they 
>> can be disabled whilst "walking" thorugh the parent menu
>
>So I merged the 23 of these which survived review and which do not
>intersect with other outstanding work.
>
>I don't think I have an opinion on whether the change is actually an
>
>If we're going to make this change, we should ensure that it is done
>kernel-wide, for UI consistency reasons.

If time permits, I'll go through the rest of the menus I find
eligible for menuconfig-izing.

Does it help to base them on -mm to work better with outstanding work?


Thanks,
Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

Hi,

On Apr 12 2007 16:07, Randy Dunlap wrote:
>On Thu, 12 Apr 2007 15:50:12 -0700 Andrew Morton wrote:
>> 
>> So I merged the 23 of these which survived review and which do not
>> intersect with other outstanding work.
>> 
>> I don't think I have an opinion on whether the change is actually an
>> improvement, and I don't get a clear sense of what others think.  Shrug.
>
>I like them, but then I have made & sent similar patches in the past.

Would you like to go through remaining menus and make the patches?
Just that efforts are not needlessy duplicated again. And of course
for you to get your share if you desire so.


Thanks,
Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Randy Dunlap]

Jan Engelhardt wrote:
> Hi,
> 
> On Apr 12 2007 16:07, Randy Dunlap wrote:
>> On Thu, 12 Apr 2007 15:50:12 -0700 Andrew Morton wrote:
>>> So I merged the 23 of these which survived review and which do not
>>> intersect with other outstanding work.
>>>
>>> I don't think I have an opinion on whether the change is actually an
>>> improvement, and I don't get a clear sense of what others think.  Shrug.
>> I like them, but then I have made & sent similar patches in the past.
> 
> Would you like to go through remaining menus and make the patches?
> Just that efforts are not needlessy duplicated again. And of course
> for you to get your share if you desire so.

Hi,

I'm a bit too busy at the moment so please go ahead with it.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH 0/30] Use menuconfig objects

[Andrew Morton]

On Fri, 13 Apr 2007 01:16:35 +0200 (MEST)
Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> On Apr 12 2007 15:50, Andrew Morton wrote:
> >On Tue, 10 Apr 2007 21:17:40 +0200 (MEST)
> >Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
> >
> >> the following patch series turns some menus into menuconfigs, so they 
> >> can be disabled whilst "walking" thorugh the parent menu
> >
> >So I merged the 23 of these which survived review and which do not
> >intersect with other outstanding work.
> >
> >I don't think I have an opinion on whether the change is actually an
> >
> >If we're going to make this change, we should ensure that it is done
> >kernel-wide, for UI consistency reasons.
> 
> If time permits, I'll go through the rest of the menus I find
> eligible for menuconfig-izing.

OK.  It's encouraging that Randy is on board.

> Does it help to base them on -mm to work better with outstanding work?

At this stage in the development cycle:

 5444 files changed, 530428 insertions(+), 179401 deletions(-)

yes, it helps quite a lot.

Re: [PATCH 10/30 #2] Use menuconfig objects - I2C

[Jean Delvare]

On Wed, 11 Apr 2007 14:28:30 +0200 (MEST), Jan Engelhardt wrote:
> Allow the whole I2C menu to be disabled at once without diving into
> the submenus for deselecting all options (should the user desire so).
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> 
>  Kconfig        |   15 ++-------
>  algos/Kconfig  |    8 +---
>  busses/Kconfig |   93 +++++++++++++++++++++++++++------------------------------
>  chips/Kconfig  |   23 ++++++--------
>  4 files changed, 62 insertions(+), 77 deletions(-)

Applied, thanks.

-- 
Jean Delvare

Re: [PATCH 0/30] Use menuconfig objects

[Jean Delvare]

Jan,

On Tue, 10 Apr 2007 21:17:40 +0200 (MEST), Jan Engelhardt wrote:
> the following patch series turns some menus into menuconfigs, so they 
> can be disabled whilst "walking" thorugh the parent menu (check the 
> videos [1], [2] to see what I mean), enabling for disabling lots of 
> options _quickly_.
> 
> I'll send the patches (as a reply to this mail) piece by piece out
> when I figure out the maintainers to Cc for each.
> 
> [1] 6.04 MB(1000s) 70 sec http://jengelh.hopto.org/mc/without.ogg
> [2] 1.96 MB(1000s) 44 sec http://jengelh.hopto.org/mc/with.ogg

You might want to try the -q flag of quilt push and quilt pop.

> I have not poked on all subsystems (it is quite a lot), but I can 
> already give a glimpse (`ls -1`) of who gets one and who does not.
> And, I am not completely finished changing some subsystems - but
> the patches are already big enough for a first wave. I want to get
> some feedback first. Thanks!
> 
> `ls -1`:
> 	menuconfig-acpi.diff
> 	menuconfig-apm.diff
> 	menuconfig-ata.diff
> 	menuconfig-block.diff
> 	menuconfig-connector.diff
> 	menuconfig-crypto.diff
> 	menuconfig-crypto2.diff
> 	menuconfig-dccp.diff
> 	menuconfig-fusion.diff
> 	menuconfig-i2c.diff
> 	menuconfig-i2o.diff
> 	menuconfig-ide.diff
> 	menuconfig-ieee1394.diff
> 	menuconfig-md.diff
> 	menuconfig-modules.diff
> 	menuconfig-mtd.diff
> 	menuconfig-net-ipvs.diff
> 	menuconfig-net-sctp.diff
> 	menuconfig-net-tipc.diff
> 	menuconfig-netdev-arcnet.diff
> 	menuconfig-netdev-phy.diff
> 	menuconfig-netdev-tr.diff
> 	menuconfig-netdev.diff
> 	menuconfig-oldcd.diff
> 	menuconfig-parport.diff
> 	menuconfig-pcihotplug.diff
> 	menuconfig-pcmcia.diff
> 	menuconfig-pnp.diff
> 	menuconfig-scsi.diff
> 	menuconfig-w1.diff

As far as I can see, the hwmon subsystem would benefit from that too.

-- 
Jean Delvare

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On Apr 13 2007 11:50, Jean Delvare wrote:
>
>As far as I can see, the hwmon subsystem would benefit from that too.

yeah next series...

Jan
-- 

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Stefan Richter]

Jan Engelhardt wrote on 2007-04-10:
> Use menuconfigs instead of menus, so the whole menu can be disabled at        
> once instead of going through all options.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> 
> Index: linux-2.6.21-rc5/drivers/ieee1394/Kconfig
> ===================================================================
> --- linux-2.6.21-rc5.orig/drivers/ieee1394/Kconfig
> +++ linux-2.6.21-rc5/drivers/ieee1394/Kconfig
> @@ -1,8 +1,6 @@
>  # -*- shell-script -*-
>  
> -menu "IEEE 1394 (FireWire) support"
> -
> -config IEEE1394
> +menuconfig IEEE1394
>  	tristate "IEEE 1394 (FireWire) support"
>  	depends on PCI || BROKEN
>  	select NET
[...]

Unless there are objections, I will merge it into my queue of IEEE 1394
updates for Linus.

(Personally, I still don't like it a lot. But perhaps only because I
have to untangle some -mm differences for this.)
-- 
Stefan Richter
-=====-=-=== -=-- ==-==
http://arcgraph.de/sr/

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Jan Engelhardt]

On Apr 27 2007 22:56, Stefan Richter wrote:

>> -config IEEE1394
>> +menuconfig IEEE1394
>>  	tristate "IEEE 1394 (FireWire) support"
>>  	depends on PCI || BROKEN
>>  	select NET
>[...]
>
>Unless there are objections, I will merge it into my queue of IEEE 1394
>updates for Linus.

Yes, I do have objections now that the ieee1394 is different in
2.6.21-rc7-mm1.
Now you have two options in the firewire menu, namely the new
stack and the old stack. Then menuconfig is not really suitable
anymore.
So please skip it until the old stack finds its way out (which may
take some more time, yes).


Jan
-- 

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Stefan Richter]

Jan Engelhardt wrote:
> On Apr 27 2007 22:56, Stefan Richter wrote:
> 
>>> -config IEEE1394
>>> +menuconfig IEEE1394
>>>  	tristate "IEEE 1394 (FireWire) support"
>>>  	depends on PCI || BROKEN
>>>  	select NET
>> [...]
>>
>> Unless there are objections, I will merge it into my queue of IEEE 1394
>> updates for Linus.
> 
> Yes, I do have objections now that the ieee1394 is different in
> 2.6.21-rc7-mm1.
> Now you have two options in the firewire menu, namely the new
> stack and the old stack. Then menuconfig is not really suitable
> anymore.
> So please skip it until the old stack finds its way out (which may
> take some more time, yes).

My idea, which I planned to cast into a patch during this weekend, was
to keep a patch in linux1394-2.6.git's feed to -mm which basically
restores what can now be seen in -mm  (one 1394 menu, two big
subsections in it), while Linus' tree gets the menuconfig form.

On the other hand, there may come a period were Linus' tree gets
something like we have in -mm, i.e. the choice to enable one or the
other or both or none of the two stacks.

So, shall I put Jan's patch aside until there is only one stack left?

Or what about:

	menuconfig FIREWIRE_SUPPORT
		tristate "IEEE 1394 (FireWire) support"

	config FIREWIRE
		tristate "new FireWire stack, alias Juju"
		depends on FIREWIRE_SUPPORT && !(IEEE1394=y)
		default m
	[...]

	config IEEE1394
		tristate "legacy FireWire stack"
		depends on FIREWIRE_SUPPORT && !(FIREWIRE=y)
		default m
	[...]

	comment "You can have both stacks installed but should blacklist
	         the modules of one of them.  Else modules from both
	         stacks will be autoloaded on hotplug events."
		depends on FIREWIRE && IEEE1394

(Untested pseudo code.)  This would add an extra level of yes/no/m
choice for those who want FireWire drivers.  But it lets people who
don't want FireWire skip everything at the superordinate menu.
-- 
Stefan Richter
-=====-=-=== -=-- ===--
http://arcgraph.de/sr/

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Jan Engelhardt]

On Apr 28 2007 12:41, Stefan Richter wrote:
>
>So, shall I put Jan's patch aside until there is only one stack left?

Sort of.

>Or what about:
>
>	menuconfig FIREWIRE_SUPPORT
>		tristate "IEEE 1394 (FireWire) support"
>
>	config FIREWIRE
>		tristate "new FireWire stack, alias Juju"
>		depends on FIREWIRE_SUPPORT && !(IEEE1394=y)
>		default m
>	[...]
>
>	config IEEE1394
>		tristate "legacy FireWire stack"
>		depends on FIREWIRE_SUPPORT && !(FIREWIRE=y)

Would
&& FIREWIRE != y
work?

>		default m
>	[...]
>
>	comment "You can have both stacks installed but should blacklist
>	         the modules of one of them.  Else modules from both
>	         stacks will be autoloaded on hotplug events."
>		depends on FIREWIRE && IEEE1394

If you *really* want to do that, then have it. But when a menu has
two or three choices (in this case: larger subsystems), it's rand()
for me whether or not to convert to menuconfig.
Feel free.



Jan
-- 

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Stefan Richter]

Jan Engelhardt wrote:
> On Apr 28 2007 12:41, Stefan Richter wrote:
>> So, shall I put Jan's patch aside until there is only one stack left?
> 
> Sort of.
[...]
> when a menu has
> two or three choices (in this case: larger subsystems), it's rand()
> for me whether or not to convert to menuconfig.
> Feel free.

I'll see if anybody out there will voice an opinion, to tip the balance
one way or another.
-- 
Stefan Richter
-=====-=-=== -=-- ===--
http://arcgraph.de/sr/

Re: [PATCH 13/30] Use menuconfig objects - IEEE1394

[Jan Engelhardt]

Hi,

>Jan Engelhardt wrote:
>>On Apr 28 2007 12:41, Stefan Richter wrote:
>>
>>> So, shall I put Jan's patch aside until there is only one stack left?
>>
>> Sort of. [...] when a menu has two or three choices (in this case:
>> larger subsystems), it's rand() for me whether or not to convert
>> to menuconfig. Feel free.
>
> I'll see if anybody out there will voice an opinion, to tip the
> balance one way or another.

Seems like silence. Anyway, your suggestion in 
http://lkml.org/lkml/2007/4/28/108 sounds not bad, and since it's cheap, 
I have the patch for it. (To be posted when I am through with more 
menus.)


Regards,
Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Andrew Morton]

On Tue, 10 Apr 2007 21:17:40 +0200 (MEST)
Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> the following patch series turns some menus into menuconfigs, so they 
> can be disabled whilst "walking" thorugh the parent menu (check the 
> videos [1], [2] to see what I mean), enabling for disabling lots of 
> options _quickly_.

Well Martin's little tromp through the Kconfig menus meant that I had to
repair pretty much every one of these patches.  Could you please have a
look at http://userweb.kernel.org/~akpm/menuconfig/, see if I screwed
anything up?

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On May 10 2007 15:38, Andrew Morton wrote:
>Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>
>> the following patch series turns some menus into menuconfigs, so they 
>> can be disabled whilst "walking" thorugh the parent menu (check the 
>> videos [1], [2] to see what I mean), enabling for disabling lots of 
>> options _quickly_.
>
>Well Martin's little tromp through the Kconfig menus meant that I had to
>repair pretty much every one of these patches.  Could you please have a
>look at http://userweb.kernel.org/~akpm/menuconfig/, see if I screwed
>anything up?

Onto which tree/version do they apply now?

	Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Andrew Morton]

On Fri, 11 May 2007 08:05:50 +0200 (MEST) Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:

> 
> On May 10 2007 15:38, Andrew Morton wrote:
> >Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
> >
> >> the following patch series turns some menus into menuconfigs, so they 
> >> can be disabled whilst "walking" thorugh the parent menu (check the 
> >> videos [1], [2] to see what I mean), enabling for disabling lots of 
> >> options _quickly_.
> >
> >Well Martin's little tromp through the Kconfig menus meant that I had to
> >repair pretty much every one of these patches.  Could you please have a
> >look at http://userweb.kernel.org/~akpm/menuconfig/, see if I screwed
> >anything up?
> 
> Onto which tree/version do they apply now?
> 

mainline, mostly.  There may be slight differences due to stuff in maintainer
trees.  But all the damage was in mainline.

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On May 10 2007 23:18, Andrew Morton wrote:
>On Fri, 11 May 2007 08:05:50 +0200 (MEST) Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>> On May 10 2007 15:38, Andrew Morton wrote:
>> >Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>> >
>> >> the following patch series turns some menus into menuconfigs, so they 
>> >> can be disabled whilst "walking" thorugh the parent menu (check the 
>> >> videos [1], [2] to see what I mean), enabling for disabling lots of 
>> >> options _quickly_.
>> >
>> >Well Martin's little tromp through the Kconfig menus meant that I had to
>> >repair pretty much every one of these patches.  Could you please have a
>> >look at http://userweb.kernel.org/~akpm/menuconfig/, see if I screwed
>> >anything up?

There is not much to screw. If you missed to clean a "depends on"
line, that is not problematic.

	Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Al Boldi]

Jan Engelhardt wrote:
> On Apr 11 2007 07:42, Al Boldi wrote:
> >Jan Engelhardt wrote:
> >
> >Correct, no oversight here; but it may be more meaningful, if you could
> >default select child-options based on the parent-state, like HW_RANDOM.
>
> A symbol will already have the 'magic' you describe if its creator wrote
> it that way. Changing to 'menuconfig' tokens does not change that I
> think. Consider:
>
> menu "foobar"
> config FOOBAR
>   bool "foobar"
>   default y
>
> config HW_RANDOM
>   depends on FOOBAR
>   default y
>
> endmenu
>
> This example should do things as you describe -- if FOOBAR is changed
> from n to y, HW_RANDOM should automatically do the same since it is a
> new option then.

I don't think so. But this might:

menu "foobar"
 config FOOBAR
   bool "foobar"
   default y

 config HW_RANDOM
   depends on FOOBAR
   default FOOBAR

endmenu

>
> menuconfig FOOBAR
>   bool "foobar"
>   default y
>
> if FOOBAR
>
> config HW_RANDOM
>   default y
>
> endif
>
> inhibits the same behavior AFAICS.

I think you mean "exhibits"?

>
> >Also, I don't think it's necessary to touch any of the "depends on"; keep
> >them as is, as they don't hurt staying that way, and may actually be
> >necessary under certain circumstances.  (see EMBEDDED)
>
> Simplifying the depends lines is a good thing IMO.

You are replacing the depends with an if block, which seems to add 
complexity, as we now have two constructs, if and depends.

IMHO, leave the depends as is, for simplicity and correctness and 
maintainability.

So if we have something like this:

menu "foobar"
 config FOOBAR
   bool "foobar"
   default y

 config FOOBAR_SUB1
   tristate "FOOBAR SUB1"
   depends on FOOBAR
   default m

 config FOOBAR_SUB2
   bool "FOOBAR SUB2"
   depends on FOOBAR
   default y

endmenu

Change it to something like this:

menuconfig FOOBAR
   tristate "foobar"
   default y

 config FOOBAR_SUB1
   tristate "FOOBAR SUB1"
   depends on FOOBAR
   default FOOBAR

 config FOOBAR_SUB2
   bool "FOOBAR SUB2"
   depends on FOOBAR
   default FOOBAR

without any if blocks, and maybe even in its own Kconfig.


Thanks!

--
Al

Re: [PATCH 0/30] Use menuconfig objects

[Sam Ravnborg]

On Wed, Apr 11, 2007 at 06:53:37PM +0200, Stefan Richter wrote:
> Jan Engelhardt wrote:
> > On Apr 11 2007 07:42, Al Boldi wrote:
> >>Also, I don't think it's necessary to touch any of the "depends on"; keep 
> >>them as is, as they don't hurt staying that way, and may actually be 
> >>necessary under certain circumstances.  (see EMBEDDED)
> > 
> > Simplifying the depends lines is a good thing IMO.
> 
> If explicit dependency statements are replaced by if--endif blocks, does
> this count as simplification?
Applied with some common sense - yes.
if --endif blocks has been used in several places to make dependencies consistent.
When cleaning up the net part I recall a few places where the explicit dependency
was missing causing 1) dependencies to be wrong and 2) caused indention in menu-
config to be wrong.

But yet agin do not go and replace all dependencies with if--endif blocks.
They shall be used with some good taste.


	Sam

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On Apr 11 2007 18:53, Stefan Richter wrote:
>Jan Engelhardt wrote:
>> On Apr 11 2007 07:42, Al Boldi wrote:
>>>Also, I don't think it's necessary to touch any of the "depends on"; keep 
>>>them as is, as they don't hurt staying that way, and may actually be 
>>>necessary under certain circumstances.  (see EMBEDDED)
>> 
>> Simplifying the depends lines is a good thing IMO.
>
>If explicit dependency statements are replaced by if--endif blocks, does
>this count as simplification?

According to Documentation/kbuild/, if FOO .. endif is interpreted as if
each option inside the if block had 'depends on FOO'.

If _every_ option under a menu (and that's another reason why I did not
modify _all_ Kconfig menus) has a 'depends on this or that', it can
be substituted by an if block, and yes, I take that as a simplification
since the whole LoC count goes down. What would perhaps be cool is
some indent in Kconfig to see what an if-endif block spans, but currently
this is not much needed, since two nested ifs are quite the max.

Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Stefan Richter]

Jan Engelhardt wrote:
> On Apr 11 2007 07:42, Al Boldi wrote:
>>Also, I don't think it's necessary to touch any of the "depends on"; keep 
>>them as is, as they don't hurt staying that way, and may actually be 
>>necessary under certain circumstances.  (see EMBEDDED)
> 
> Simplifying the depends lines is a good thing IMO.

If explicit dependency statements are replaced by if--endif blocks, does
this count as simplification?
-- 
Stefan Richter
-=====-=-=== -=-- -=-==
http://arcgraph.de/sr/

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On Apr 11 2007 07:42, Al Boldi wrote:
>Jan Engelhardt wrote:
>
>Correct, no oversight here; but it may be more meaningful, if you could 
>default select child-options based on the parent-state, like HW_RANDOM.

A symbol will already have the 'magic' you describe if its creator wrote 
it that way. Changing to 'menuconfig' tokens does not change that I 
think. Consider:

menu "foobar"
config FOOBAR
  bool "foobar"
  default y

config HW_RANDOM
  depends on FOOBAR
  default y

endmenu

This example should do things as you describe -- if FOOBAR is changed 
from n to y, HW_RANDOM should automatically do the same since it is a 
new option then.

menuconfig FOOBAR
  bool "foobar"
  default y

if FOOBAR

config HW_RANDOM
  default y

endif

inhibits the same behavior AFAICS.

>Also, I don't think it's necessary to touch any of the "depends on"; keep 
>them as is, as they don't hurt staying that way, and may actually be 
>necessary under certain circumstances.  (see EMBEDDED)

Simplifying the depends lines is a good thing IMO.


Jan
-- 

Re: [PATCH 0/30] Use menuconfig objects

[Al Boldi]

Jan Engelhardt wrote:
> On Apr 11 2007 01:12, Al Boldi wrote:
> >Jan Engelhardt wrote:
> >> the following patch series turns some menus into menuconfigs, so they
> >> can be disabled whilst "walking" thorugh the parent menu
> >
> >Great, but instead of making it a simple on/off, make it tri-state that
> > would default select all child-options appropriately.  (see HW_RANDOM)
>
> I do not remember having touched the Random Number Generators or Character
> Devices anywhere in this series.
>
> Don't worry, I have paid attention (or at least I hope so ;-) to
> 'm'-able options, for example the SCSI, IEEE1394, or I2C stacks.
>
> But, for example you will see
>  [*] Old CD-ROM drivers (not SCSI, not IDE)
>
> which is because this entry in itself does not generate any object file.
>
> Generally, I just made the 'menuconfig' entry have the same state
> (bool/tristate) as the original entry. If I have overseen that
> somewhere, please let me know!

Correct, no oversight here; but it may be more meaningful, if you could 
default select child-options based on the parent-state, like HW_RANDOM.

Also, I don't think it's necessary to touch any of the "depends on"; keep 
them as is, as they don't hurt staying that way, and may actually be 
necessary under certain circumstances.  (see EMBEDDED)


Thanks!

--
Al

Re: [PATCH 0/30] Use menuconfig objects

[Jan Engelhardt]

On Apr 11 2007 01:12, Al Boldi wrote:
>Jan Engelhardt wrote:
>> the following patch series turns some menus into menuconfigs, so they
>> can be disabled whilst "walking" thorugh the parent menu
>
>Great, but instead of making it a simple on/off, make it tri-state that would 
>default select all child-options appropriately.  (see HW_RANDOM)

I do not remember having touched the Random Number Generators or Character
Devices anywhere in this series.

Don't worry, I have paid attention (or at least I hope so ;-) to 
'm'-able options, for example the SCSI, IEEE1394, or I2C stacks.

But, for example you will see
 [*] Old CD-ROM drivers (not SCSI, not IDE)

which is because this entry in itself does not generate any object file.

Generally, I just made the 'menuconfig' entry have the same state 
(bool/tristate) as the original entry. If I have overseen that 
somewhere, please let me know!


Thank you,
Jan
-- 

[PATCH 0/30] Use menuconfig objects

[Al Boldi]

Jan Engelhardt wrote:
> the following patch series turns some menus into menuconfigs, so they
> can be disabled whilst "walking" thorugh the parent menu

Great, but instead of making it a simple on/off, make it tri-state that would 
default select all child-options appropriately.  (see HW_RANDOM)


Thanks!

--
Al