[PATCH] Kconfig changes: s/menu/menuconfig/

[PATCH] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

Part 1: The easy stuff.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

I hope I got it right, especially the conversions to "if SYMBOL" and 
merging the "depends on"s. It looks right, but please check that.

This patch is designed for 2.6.12; the patch for .13-rc1 will be posted
tomorrow as a reply, unless there are major objections to this patch.


Signed-Off-By: Bodo Eggert <7eggert@gmx.de>

--- a/drivers/md/Kconfig	2005-06-19 14:16:41.000000000 +0200
+++ b/drivers/md/Kconfig	2005-06-29 13:23:07.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
 	help
@@ -236,5 +234,2 @@ config DM_MULTIPATH_EMC
 	---help---
 	  Multipath support for EMC CX/AX series hardware.
-
-endmenu
-
--- a/drivers/w1/Kconfig	2005-05-02 02:25:01.000000000 +0200
+++ b/drivers/w1/Kconfig	2005-06-29 13:25:37.000000000 +0200
@@ -1,6 +1,4 @@
-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's 1-wire bus is usefull to connect slow 1-pin devices 
@@ -54,4 +52,2 @@ config W1_SMEM
 	  Say Y here if you want to connect 1-wire 
 	  simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-endmenu
--- a/drivers/i2c/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/drivers/i2c/Kconfig	2005-06-29 13:32:15.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
@@ -73,5 +71,2 @@ config I2C_DEBUG_CHIP
 	  a problem with I2C support and want to see more of what is going
 	  on.
-
-endmenu
-
--- a/drivers/fc4/Kconfig	2004-08-14 07:36:56.000000000 +0200
+++ b/drivers/fc4/Kconfig	2005-06-29 13:33:48.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Fibre Channel support"
-
-config FC4
+menuconfig FC4
 	tristate "Fibre Channel and FC4 SCSI support"
 	---help---
@@ -77,5 +75,2 @@ config SCSI_FCAL
 	prompt "Generic FC-AL disk driver"
 	depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
-
-endmenu
-
--- a/drivers/ide/Kconfig	2005-06-19 14:16:37.000000000 +0200
+++ b/drivers/ide/Kconfig	2005-06-29 13:40:15.000000000 +0200
@@ -5,7 +5,5 @@
 #
 
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
 	---help---
@@ -1053,4 +1051,2 @@ config BLK_DEV_HD
 
 endif
-
-endmenu
--- a/drivers/mmc/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/mmc/Kconfig	2005-06-29 13:41:02.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "MMC/SD Card support"
-
-config MMC
-	tristate "MMC support"
+menuconfig MMC
+	tristate "MMC/SD Card support"
 	help
 	  MMC is the "multi-media card" bus protocol.
@@ -60,4 +58,2 @@ config MMC_WBSD
 
 	  If unsure, say N.
-
-endmenu
--- a/drivers/net/wan/Kconfig	2005-06-19 14:16:52.000000000 +0200
+++ b/drivers/net/wan/Kconfig	2005-06-29 13:49:27.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wan interfaces"
-	depends on NETDEVICES
-
-config WAN
+menuconfig WAN
 	bool "Wan interfaces support"
+	depends on NETDEVICES
 	---help---
 	  Wide Area Networks (WANs), such as X.25, Frame Relay and leased
@@ -603,5 +601,2 @@ config SBNI_MULTILINE
 
 	  If unsure, say N.
-
-endmenu
-
--- a/drivers/net/irda/Kconfig	2005-06-19 14:16:48.000000000 +0200
+++ b/drivers/net/irda/Kconfig	2005-06-30 10:13:49.000000000 +0200
@@ -1,6 +1,9 @@
 
-menu "Infrared-port device drivers"
+menuconfig IRDA_DEVICES
+	bool "Infrared-port device drivers"
 	depends on IRDA!=n
 
+if IRDA_DEVICES
+
 comment "SIR device drivers"
 
@@ -401,4 +404,3 @@ config VIA_FIR
 	  via-ircc.
 
-endmenu
-
+endif
--- a/drivers/net/tulip/Kconfig	2005-05-02 02:24:03.000000000 +0200
+++ b/drivers/net/tulip/Kconfig	2005-06-29 14:09:18.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Tulip family network device support"
-	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
-
-config NET_TULIP
+menuconfig NET_TULIP
 	bool "\"Tulip\" family network device support"
+	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
 	help
 	  This selects the "Tulip" family of EISA/PCI network cards.
@@ -162,5 +160,2 @@ config PCMCIA_XIRTULIP
 	  <file:Documentation/networking/net-modules.txt>.  The module will
 	  be called xircom_tulip_cb.  If unsure, say N.
-
-endmenu
-
--- a/drivers/net/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/net/Kconfig	2005-06-30 09:07:31.000000000 +0200
@@ -136,8 +136,6 @@ endif
 #
 
-menu "Ethernet (10 or 100Mbit)"
+menuconfig NET_ETHERNET
 	depends on NETDEVICES && !UML
-
-config NET_ETHERNET
 	bool "Ethernet (10 or 100Mbit)"
 	---help---
@@ -165,4 +163,6 @@ config NET_ETHERNET
 	  the questions about Ethernet network cards. If unsure, say N.
 
+if NET_ETHERNET
+
 config MII
 	tristate "Generic Media Independent Interface device support"
@@ -1763,5 +1763,5 @@ config NE_H8300
 source "drivers/net/fec_8xx/Kconfig"
 
-endmenu
+endif
 
 #
@@ -1769,7 +1769,10 @@ endmenu
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NET_ETHERNET1000
+	bool "Ethernet (1 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET1000
+
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2082,5 +2085,5 @@ config MV643XX_ETH_2
 	  Ethernet.
 
-endmenu
+endif
 
 #
@@ -2088,7 +2091,10 @@ endmenu
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NET_ETHERNET10_000
+	bool "Ethernet (10 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET10_000
+
 config IXGB
 	tristate "Intel(R) PRO/10GbE support"
@@ -2166,5 +2172,5 @@ config 2BUFF_MODE
 	If not sure please say N.
 
-endmenu
+endif
 
 if !UML
--- a/drivers/net/arcnet/Kconfig	2005-05-02 02:25:46.000000000 +0200
+++ b/drivers/net/arcnet/Kconfig	2005-06-29 13:48:05.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "ARCnet devices"
+menuconfig ARCNET
+	tristate "ARCnet device support"
 	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
@@ -136,5 +134,2 @@ config ARCNET_COM20020_PCI
 	tristate "Support for COM20020 on PCI"
 	depends on ARCNET_COM20020 && PCI
-
-endmenu
-
--- a/drivers/net/tokenring/Kconfig	2005-05-02 02:25:48.000000000 +0200
+++ b/drivers/net/tokenring/Kconfig	2005-06-29 14:13:55.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "Token Ring devices"
+menuconfig TR
 	depends on NETDEVICES
-
-# So far, we only have PCI, ISA, and MCA token ring devices
-config TR
 	bool "Token Ring driver support"
+# So far, we only have PCI, ISA, and MCA token ring devices
 	depends on (PCI || ISA || MCA || CCW)
 	select LLC
@@ -182,5 +180,2 @@ config SMCTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called smctr.
-
-endmenu
-
--- a/drivers/net/pcmcia/Kconfig	2005-05-02 02:25:47.000000000 +0200
+++ b/drivers/net/pcmcia/Kconfig	2005-06-29 14:21:56.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "PCMCIA network device support"
-	depends on NETDEVICES && PCMCIA!=n
-
-config NET_PCMCIA
+menuconfig NET_PCMCIA
 	bool "PCMCIA network device support"
+	depends on NETDEVICES && PCMCIA!=n
 	---help---
 	  Say Y if you would like to include support for any PCMCIA or CardBus
@@ -128,5 +126,2 @@ config PCMCIA_IBMTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called ibmtr_cs.
-
-endmenu
-
--- a/drivers/net/wireless/Kconfig	2005-06-19 14:16:52.000000000 +0200
+++ b/drivers/net/wireless/Kconfig	2005-06-29 14:25:06.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wireless LAN (non-hamradio)"
-	depends on NETDEVICES
-
-config NET_RADIO
+menuconfig NET_RADIO
 	bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+	depends on NETDEVICES
 	---help---
 	  Support for wireless LANs and everything having to do with radio,
@@ -361,5 +359,2 @@ config NET_WIRELESS
 	depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 	default y
-
-endmenu
-
--- a/drivers/mtd/nand/Kconfig	2005-05-02 02:25:46.000000000 +0200
+++ b/drivers/mtd/nand/Kconfig	2005-06-29 14:45:32.000000000 +0200
@@ -2,9 +2,10 @@
 # $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
 
-menu "NAND Flash Device Drivers"
-	depends on MTD!=n
+config MTD_NAND_IDS
+	depends on MTD
+	tristate
 
-config MTD_NAND
-	tristate "NAND Device Support"
+menuconfig MTD_NAND
+	tristate "NAND Flash Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
@@ -56,7 +57,4 @@ config MTD_NAND_TOTO
 	  Support for NAND flash on Texas Instruments Toto platform.
 
-config MTD_NAND_IDS
-	tristate
-
 config MTD_NAND_TX4925NDFMC
 	tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
@@ -204,4 +202,2 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
 	  The simulator may simulate verious NAND flash chips for the
 	  MTD nand layer.
- 
-endmenu
--- a/drivers/mtd/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/mtd/Kconfig	2005-06-29 14:30:26.000000000 +0200
@@ -1,7 +1,5 @@
 # $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $
 
-menu "Memory Technology Devices (MTD)"
-
-config MTD
+menuconfig MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
@@ -261,5 +259,2 @@ source "drivers/mtd/devices/Kconfig"
 
 source "drivers/mtd/nand/Kconfig"
-
-endmenu
-
--- a/drivers/pci/hotplug/Kconfig	2005-05-02 02:25:49.000000000 +0200
+++ b/drivers/pci/hotplug/Kconfig	2005-06-29 14:49:25.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL
@@ -193,5 +191,2 @@ config HOTPLUG_PCI_SGI
 
 	  When in doubt, say N.
-
-endmenu
-
--- a/drivers/pnp/Kconfig	2005-05-02 02:24:56.000000000 +0200
+++ b/drivers/pnp/Kconfig	2005-06-29 14:51:49.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Plug and Play support"
-
-config PNP
+menuconfig PNP
 	bool "Plug and Play support"
 	depends on ISA || ACPI_BUS
@@ -37,5 +35,2 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
-
-endmenu
-
--- a/drivers/usb/serial/Kconfig	2005-06-19 14:17:06.000000000 +0200
+++ b/drivers/usb/serial/Kconfig	2005-06-29 15:05:18.000000000 +0200
@@ -3,8 +3,5 @@
 #
 
-menu "USB Serial Converter support"
-	depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
 	depends on USB
@@ -481,4 +478,2 @@ config USB_EZUSB
 	default y
 
-endmenu
-
--- a/drivers/acpi/Kconfig	2005-06-19 14:16:26.000000000 +0200
+++ b/drivers/acpi/Kconfig	2005-06-29 15:08:06.000000000 +0200
@@ -3,13 +3,10 @@
 #
 
-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+	bool "ACPI (Advanced Configuration and Power Interface) Support"
 	depends on !X86_VISWS
 	depends on !IA64_HP_SIM
 	depends on IA64 || X86
 
-config ACPI
-	bool "ACPI Support"
-	depends on IA64 || X86
-
 	default y
 	---help---
@@ -352,4 +349,2 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
-
-endmenu
--- a/drivers/char/tpm/Kconfig	2005-06-19 14:16:33.000000000 +0200
+++ b/drivers/char/tpm/Kconfig	2005-06-29 15:10:22.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "TPM devices"
-
-config TCG_TPM
+menuconfig TCG_TPM
 	tristate "TPM Hardware Support"
 	depends on EXPERIMENTAL && PCI
@@ -35,5 +33,2 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver 
 	  as a module, choose M here; the module will be called tpm_atmel.
-
-endmenu
-
--- a/drivers/char/ipmi/Kconfig	2005-05-02 02:25:43.000000000 +0200
+++ b/drivers/char/ipmi/Kconfig	2005-06-29 15:11:42.000000000 +0200
@@ -3,6 +3,5 @@
 #
 
-menu "IPMI"
-config IPMI_HANDLER
+menuconfig IPMI_HANDLER
        tristate 'IPMI top-level message handler'
        help
@@ -64,4 +63,2 @@ config IPMI_POWEROFF
          This enables a function to power off the system with IPMI if
 	 the IPMI management controller is capable of this.
-
-endmenu
--- a/drivers/char/watchdog/Kconfig	2005-06-19 14:16:33.000000000 +0200
+++ b/drivers/char/watchdog/Kconfig	2005-06-29 15:14:36.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG
 	bool "Watchdog Timer Support"
 	---help---
@@ -546,4 +544,2 @@ config USBPCWATCHDOG
 
 	  Most people will say N.
-
-endmenu
--- a/drivers/isdn/hisax/Kconfig	2005-06-19 14:16:40.000000000 +0200
+++ b/drivers/isdn/hisax/Kconfig	2005-06-29 15:24:55.000000000 +0200
@@ -1,8 +1,6 @@
 
-menu "Passive cards"
+menuconfig ISDN_DRV_HISAX
+	tristate "Passive cards (HiSax, HFC)"
 	depends on ISDN_I4L
-
-config ISDN_DRV_HISAX
-	tristate "HiSax SiemensChipSet driver support"
 	select CRC_CCITT
 	---help---
@@ -438,5 +436,2 @@ config HISAX_AVM_A1_PCMCIA
 
 endif
-
-endmenu
-
--- a/drivers/isdn/Kconfig	2004-08-14 07:38:04.000000000 +0200
+++ b/drivers/isdn/Kconfig	2005-06-29 15:26:04.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "ISDN subsystem"
-
-config ISDN
-	tristate "ISDN support"
+menuconfig ISDN
+	tristate "ISDN subsystem"
 	depends on NET
 	---help---
@@ -63,5 +61,2 @@ source "drivers/isdn/capi/Kconfig"
 
 source "drivers/isdn/hardware/Kconfig"
-
-endmenu
-
--- a/drivers/isdn/hardware/avm/Kconfig	2005-05-02 02:24:52.000000000 +0200
+++ b/drivers/isdn/hardware/avm/Kconfig	2005-06-29 15:29:00.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active AVM cards"
+menuconfig CAPI_AVM
+	bool "Active AVM cards"
 	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_AVM
-	bool "Support AVM cards"
 	help
 	  Enable support for AVM active ISDN cards.
@@ -62,5 +60,2 @@ config ISDN_DRV_AVMB1_C4
 	  Enable support for the AVM C4/C2 PCI cards.
 	  These cards handle 4/2 BRI ISDN lines (8/4 channels).
-
-endmenu
-
--- a/drivers/isdn/hardware/eicon/Kconfig	2004-08-14 07:36:59.000000000 +0200
+++ b/drivers/isdn/hardware/eicon/Kconfig	2005-06-29 15:29:27.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active Eicon DIVA Server cards"
-	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_EICON
+menuconfig CAPI_EICON
 	bool "Support Eicon cards"
+	depends on NET && ISDN && ISDN_CAPI!=n
 	help
 	  Enable support for Eicon Networks active ISDN cards.
@@ -49,5 +47,2 @@ config ISDN_DIVAS_MAINT
 	help
 	  Enable Divas Maintainance driver.
-
-endmenu
-
--- a/drivers/scsi/Kconfig	2005-06-19 14:16:58.000000000 +0200
+++ b/drivers/scsi/Kconfig	2005-06-29 15:30:59.000000000 +0200
@@ -1,5 +1,3 @@
-menu "SCSI device support"
-
-config SCSI
+menuconfig SCSI
 	tristate "SCSI device support"
 	---help---
@@ -1797,4 +1795,2 @@ endmenu
 
 source "drivers/scsi/pcmcia/Kconfig"
-
-endmenu
--- a/drivers/scsi/pcmcia/Kconfig	2004-08-14 07:37:25.000000000 +0200
+++ b/drivers/scsi/pcmcia/Kconfig	2005-06-29 15:33:03.000000000 +0200
@@ -3,7 +3,10 @@
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n && MODULES
 
+if SCSI_PCMCIA
+
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
@@ -80,3 +83,3 @@ config PCMCIA_SYM53C500
 	  module will be called sym53c500_cs.
 
-endmenu
+endif
--- a/drivers/infiniband/Kconfig	2005-05-02 02:25:44.000000000 +0200
+++ b/drivers/infiniband/Kconfig	2005-06-29 15:35:18.000000000 +0200
@@ -1,5 +1,3 @@
-menu "InfiniBand support"
-
-config INFINIBAND
+menuconfig INFINIBAND
 	tristate "InfiniBand support"
 	---help---
@@ -11,4 +9,2 @@ source "drivers/infiniband/hw/mthca/Kcon
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
-
-endmenu
--- a/drivers/cdrom/Kconfig	2005-06-19 14:16:31.000000000 +0200
+++ b/drivers/cdrom/Kconfig	2005-06-29 11:27:02.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Old CD-ROM drivers (not SCSI, not IDE)"
+menuconfig CD_NO_IDESCSI
+	bool "Old CD-ROM drivers (not SCSI, IDE or ATAPI)"
 	depends on ISA
-
-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
@@ -210,4 +208,2 @@ config CDU535
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonycd535.
-
-endmenu
--- a/drivers/media/dvb/Kconfig	2005-06-19 14:16:41.000000000 +0200
+++ b/drivers/media/dvb/Kconfig	2005-06-29 15:50:58.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Digital Video Broadcasting Devices"
-
-config DVB
-	bool "DVB For Linux"
+menuconfig DVB
+	bool "Digital Video Broadcasting Devices"
 	depends on NET && INET
 	---help---
@@ -44,4 +42,2 @@ comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
-
-endmenu
--- a/drivers/video/logo/Kconfig	2005-06-19 14:17:08.000000000 +0200
+++ b/drivers/video/logo/Kconfig	2005-06-29 15:59:13.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Logo configuration"
-
-config LOGO
-	bool "Bootup logo"
+menuconfig LOGO
+	bool "Bootup logo configuration"
 	depends on FB || SGI_NEWPORT_CONSOLE
 
@@ -63,5 +61,2 @@ config LOGO_SUPERH_CLUT224
 	depends on LOGO && SUPERH
 	default y
-
-endmenu
-
--- a/drivers/message/i2o/Kconfig	2004-08-14 07:36:13.000000000 +0200
+++ b/drivers/message/i2o/Kconfig	2005-06-29 16:05:13.000000000 +0200
@@ -1,6 +1,3 @@
-
-menu "I2O device support"
-
-config I2O
+menuconfig I2O
 	tristate "I2O support"
 	depends on PCI
@@ -71,5 +68,2 @@ config I2O_PROC
 	  To compile this support as a module, choose M here: the
 	  module will be called i2o_proc.
-
-endmenu
-
--- a/drivers/message/fusion/Kconfig	2005-05-02 02:24:54.000000000 +0200
+++ b/drivers/message/fusion/Kconfig	2005-06-29 16:07:51.000000000 +0200
@@ -1,7 +1,4 @@
-
-menu "Fusion MPT device support"
-
-config FUSION
-	tristate "Fusion MPT (base + ScsiHost) drivers"
+menuconfig FUSION
+	tristate "Fusion MPT support (base + ScsiHost)"
 	depends on PCI && SCSI
 	---help---
@@ -63,4 +60,2 @@ config FUSION_LAN
 
 	  If unsure whether you really want or need this, say N.
-
-endmenu
--- a/drivers/ieee1394/Kconfig	2005-06-19 14:16:37.000000000 +0200
+++ b/drivers/ieee1394/Kconfig	2005-06-29 16:10:10.000000000 +0200
@@ -1,7 +1,5 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support"
-
-config IEEE1394
+menuconfig IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
 	depends on PCI || BROKEN
@@ -180,4 +178,2 @@ config IEEE1394_AMDTP
 	  To compile this driver as a module, say M here: the
 	  module will be called amdtp.
-
-endmenu
--- a/drivers/pcmcia/Kconfig	2005-06-19 14:16:54.000000000 +0200
+++ b/drivers/pcmcia/Kconfig	2005-06-29 16:12:49.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
 	tristate "PCCard (PCMCIA/CardBus) support"
 	select HOTPLUG
@@ -200,4 +198,2 @@ config PCCARD_NONSTATIC
 
 endif	# PCCARD
-
-endmenu
--- a/drivers/telephony/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/drivers/telephony/Kconfig	2005-06-29 16:31:22.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Telephony Support"
-
-config PHONE
-	tristate "Linux telephony support"
+menuconfig PHONE
+	tristate "Telephony support"
 	---help---
 	  Say Y here if you have a telephony card, which for example allows
@@ -43,5 +41,2 @@ config PHONE_IXJ_PCMCIA
 	  cards manufactured by Quicknet Technologies, Inc.  This changes the
 	  card initialization code to work with the card manager daemon.
-
-endmenu
-
--- a/drivers/parport/Kconfig	2005-06-19 14:16:53.000000000 +0200
+++ b/drivers/parport/Kconfig	2005-06-29 16:33:53.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
 	tristate "Parallel port support"
 	---help---
@@ -84,4 +82,5 @@ config PARPORT_PC_PCMCIA
 
 config PARPORT_NOT_PC
+	depends on PARPORT
 	bool
 
@@ -141,5 +140,2 @@ config PARPORT_1284
 	  transfer modes. Also say Y if you want device ID information to
 	  appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
-
-endmenu
-
--- a/fs/nls/Kconfig	2004-08-14 07:36:10.000000000 +0200
+++ b/fs/nls/Kconfig	2005-06-30 08:37:19.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Native Language Support"
-
-config NLS
-	tristate "Base native language support"
+menuconfig NLS
+	tristate "Native language support"
 	---help---
 	  The base Native Language Support. A number of filesystems
@@ -501,4 +499,2 @@ config NLS_UTF8
 	  the Unicode/ISO9646 universal character set.
 
-endmenu
-
--- a/fs/xfs/Kconfig	2005-05-02 02:25:53.000000000 +0200
+++ b/fs/xfs/Kconfig	2005-06-30 08:41:21.000000000 +0200
@@ -1,6 +1,4 @@
-menu "XFS support"
-
-config XFS_FS
-	tristate "XFS filesystem support"
+menuconfig XFS_FS
+	tristate "XFS support"
 	select EXPORTFS if NFSD!=n
 	help
@@ -21,11 +19,13 @@ config XFS_FS
 	  to use an initial ramdisk (initrd) to boot.
 
+if XFS_FS
+
 config XFS_EXPORT
 	bool
-	default y if XFS_FS && EXPORTFS
+	default y if EXPORTFS
 
 config XFS_RT
 	bool "Realtime support (EXPERIMENTAL)"
-	depends on XFS_FS && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here you will be able to mount and use XFS filesystems
@@ -44,5 +44,4 @@ config XFS_RT
 config XFS_QUOTA
 	bool "Quota support"
-	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
@@ -61,5 +60,4 @@ config XFS_QUOTA
 config XFS_SECURITY
 	bool "Security Label support"
-	depends on XFS_FS
 	help
 	  Security labels support alternative access control models
@@ -73,5 +71,4 @@ config XFS_SECURITY
 config XFS_POSIX_ACL
 	bool "POSIX ACL support"
-	depends on XFS_FS
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -83,3 +80,3 @@ config XFS_POSIX_ACL
 	  If you don't know what Access Control Lists are, say N.
 
-endmenu
+endif
--- a/fs/Kconfig	2005-06-19 14:17:10.000000000 +0200
+++ b/fs/Kconfig	2005-06-30 09:40:19.000000000 +0200
@@ -1718,10 +1718,6 @@ config RXRPC
 endmenu
 
-menu "Partition Types"
-
 source "fs/partitions/Kconfig"
 
-endmenu
-
 source "fs/nls/Kconfig"
 
--- a/init/Kconfig	2005-06-19 14:17:44.000000000 +0200
+++ b/init/Kconfig	2005-06-30 09:17:08.000000000 +0200
@@ -391,8 +391,6 @@ config BASE_SMALL
 	default 1 if !BASE_FULL
 
-menu "Loadable module support"
-
-config MODULES
-	bool "Enable loadable module support"
+menuconfig MODULES
+	bool "Loadable module support"
 	help
 	  Kernel modules are small pieces of compiled code which can
@@ -413,7 +411,8 @@ config MODULES
 	  If unsure, say Y.
 
+if MODULES
+
 config MODULE_UNLOAD
 	bool "Module unloading"
-	depends on MODULES
 	help
 	  Without this option you will not be able to unload any
@@ -435,5 +434,4 @@ config OBSOLETE_MODPARM
 	bool
 	default y
-	depends on MODULES
 	help
 	  You need this option to use module parameters on modules which
@@ -443,5 +441,5 @@ config OBSOLETE_MODPARM
 config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
-	depends on MODULES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Usually, you have to use modules compiled with your kernel.
@@ -454,5 +452,4 @@ config MODVERSIONS
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
@@ -466,5 +463,4 @@ config MODULE_SRCVERSION_ALL
 config KMOD
 	bool "Automatic kernel module loading"
-	depends on MODULES
 	help
 	  Normally when you have selected some parts of the kernel to
@@ -482,3 +478,4 @@ config STOP_MACHINE
 	help
 	  Need stop_machine() primitive.
-endmenu
+
+endif
--- a/net/sctp/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/net/sctp/Kconfig	2005-06-30 08:53:42.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
 	depends on IPV6 || IPV6=n
+	depends on INET && EXPERIMENTAL
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -87,3 +85,2 @@ config SCTP_HMAC_MD5
 
 endchoice
-endmenu
--- a/net/bridge/netfilter/Kconfig	2005-05-02 02:26:17.000000000 +0200
+++ b/net/bridge/netfilter/Kconfig	2005-06-30 09:00:33.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Bridge: Netfilter Configuration"
-	depends on BRIDGE && NETFILTER
-
-config BRIDGE_NF_EBTABLES
+menuconfig BRIDGE_NF_EBTABLES
 	tristate "Ethernet Bridge tables (ebtables) support"
+	depends on BRIDGE && NETFILTER
 	help
 	  ebtables is a general, extensible frame/packet identification
@@ -208,4 +206,2 @@ config BRIDGE_EBT_ULOG
 
 	  To compile it as a module, choose M here.  If unsure, say N.
-
-endmenu
--- a/sound/Kconfig	2005-05-02 02:26:19.000000000 +0200
+++ b/sound/Kconfig	2005-06-29 16:50:57.000000000 +0200
@@ -2,7 +2,5 @@
 #
 
-menu "Sound"
-
-config SOUND
+menuconfig SOUND
 	tristate "Sound card support"
 	help
@@ -33,12 +31,11 @@ config SOUND
 	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
 
+if SOUND
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 
-menu "Advanced Linux Sound Architecture"
-	depends on SOUND!=n
-
-config SND
+menuconfig SND
 	tristate "Advanced Linux Sound Architecture"
 	depends on SOUND
@@ -70,12 +67,7 @@ source "sound/sparc/Kconfig"
 source "sound/parisc/Kconfig"
 
-endmenu
-
-menu "Open Sound System"
-	depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
-
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
+	depends on SOUND && (BROKEN || (!SPARC32 && !SPARC64))
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
@@ -83,7 +75,5 @@ config SOUND_PRIME
 source "sound/oss/Kconfig"
 
-endmenu
-
 endif
 
-endmenu
+endif
-- 
The worse the weather, the more you are required to be out in it. 

Re: [PATCH] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

Part 1b: The easy stuff for 2.6.13-rc1.

--- rc1-a/drivers/md/Kconfig	2005-06-30 11:21:40.000000000 +0200
+++ rc1-b/drivers/md/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
 	help
@@ -236,5 +234,2 @@ config DM_MULTIPATH_EMC
 	---help---
 	  Multipath support for EMC CX/AX series hardware.
-
-endmenu
-
--- rc1-a/drivers/w1/Kconfig	2005-06-30 11:22:41.000000000 +0200
+++ rc1-b/drivers/w1/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,4 @@
-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's 1-wire bus is usefull to connect slow 1-pin devices
@@ -54,4 +52,2 @@ config W1_SMEM
 	  Say Y here if you want to connect 1-wire
 	  simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-endmenu
--- rc1-a/drivers/i2c/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ rc1-b/drivers/i2c/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
@@ -73,5 +71,2 @@ config I2C_DEBUG_CHIP
 	  a problem with I2C support and want to see more of what is going
 	  on.
-
-endmenu
-
--- rc1-a/drivers/fc4/Kconfig	2004-08-14 07:36:56.000000000 +0200
+++ rc1-b/drivers/fc4/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Fibre Channel support"
-
-config FC4
+menuconfig FC4
 	tristate "Fibre Channel and FC4 SCSI support"
 	---help---
@@ -77,5 +75,2 @@ config SCSI_FCAL
 	prompt "Generic FC-AL disk driver"
 	depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
-
-endmenu
-
--- rc1-a/drivers/ide/Kconfig	2005-06-30 11:22:23.000000000 +0200
+++ rc1-b/drivers/ide/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -5,7 +5,5 @@
 #
 
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
 	---help---
@@ -1059,4 +1057,2 @@ config BLK_DEV_HD
 
 endif
-
-endmenu
--- rc1-a/drivers/mmc/Kconfig	2005-06-30 11:21:42.000000000 +0200
+++ rc1-b/drivers/mmc/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "MMC/SD Card support"
-
-config MMC
-	tristate "MMC support"
+menuconfig MMC
+	tristate "MMC/SD Card support"
 	help
 	  MMC is the "multi-media card" bus protocol.
@@ -60,4 +58,2 @@ config MMC_WBSD
 
 	  If unsure, say N.
-
-endmenu
--- rc1-a/drivers/net/wan/Kconfig	2005-06-30 11:22:37.000000000 +0200
+++ rc1-b/drivers/net/wan/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wan interfaces"
-	depends on NETDEVICES
-
-config WAN
+menuconfig WAN
 	bool "Wan interfaces support"
+	depends on NETDEVICES
 	---help---
 	  Wide Area Networks (WANs), such as X.25, Frame Relay and leased
@@ -603,5 +601,2 @@ config SBNI_MULTILINE
 
 	  If unsure, say N.
-
-endmenu
-
--- rc1-a/drivers/net/irda/Kconfig	2005-06-30 11:21:44.000000000 +0200
+++ rc1-b/drivers/net/irda/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,9 @@
 
-menu "Infrared-port device drivers"
+menuconfig IRDA_DEVICES
+	bool "Infrared-port device drivers"
 	depends on IRDA!=n
 
+if IRDA_DEVICES
+
 comment "SIR device drivers"
 
@@ -401,4 +404,3 @@ config VIA_FIR
 	  via-ircc.
 
-endmenu
-
+endif
--- rc1-a/drivers/net/tulip/Kconfig	2005-06-30 11:18:11.000000000 +0200
+++ rc1-b/drivers/net/tulip/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Tulip family network device support"
-	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
-
-config NET_TULIP
+menuconfig NET_TULIP
 	bool "\"Tulip\" family network device support"
+	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
 	help
 	  This selects the "Tulip" family of EISA/PCI network cards.
@@ -162,5 +160,2 @@ config PCMCIA_XIRTULIP
 	  <file:Documentation/networking/net-modules.txt>.  The module will
 	  be called xircom_tulip_cb.  If unsure, say N.
-
-endmenu
-
--- rc1-a/drivers/net/Kconfig	2005-06-30 11:22:26.000000000 +0200
+++ rc1-b/drivers/net/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -136,8 +136,6 @@ endif
 #
 
-menu "Ethernet (10 or 100Mbit)"
+menuconfig NET_ETHERNET
 	depends on NETDEVICES && !UML
-
-config NET_ETHERNET
 	bool "Ethernet (10 or 100Mbit)"
 	---help---
@@ -165,4 +163,6 @@ config NET_ETHERNET
 	  the questions about Ethernet network cards. If unsure, say N.
 
+if NET_ETHERNET
+
 config MII
 	tristate "Generic Media Independent Interface device support"
@@ -1752,5 +1752,5 @@ config NE_H8300
 source "drivers/net/fec_8xx/Kconfig"
 
-endmenu
+endif
 
 #
@@ -1758,7 +1758,10 @@ endmenu
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NET_ETHERNET1000
+	bool "Ethernet (1 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET1000
+
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2083,5 +2086,5 @@ config MV643XX_ETH_2
 	  Ethernet.
 
-endmenu
+endif
 
 #
@@ -2089,7 +2092,10 @@ endmenu
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NET_ETHERNET10_000
+	bool "Ethernet (10 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET10_000
+
 config IXGB
 	tristate "Intel(R) PRO/10GbE support"
@@ -2167,5 +2173,5 @@ config 2BUFF_MODE
 	If not sure please say N.
 
-endmenu
+endif
 
 if !UML
--- rc1-a/drivers/net/arcnet/Kconfig	2005-06-30 11:20:35.000000000 +0200
+++ rc1-b/drivers/net/arcnet/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "ARCnet devices"
+menuconfig ARCNET
+	tristate "ARCnet device support"
 	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
@@ -136,5 +134,2 @@ config ARCNET_COM20020_PCI
 	tristate "Support for COM20020 on PCI"
 	depends on ARCNET_COM20020 && PCI
-
-endmenu
-
--- rc1-a/drivers/net/tokenring/Kconfig	2005-06-30 11:20:36.000000000 +0200
+++ rc1-b/drivers/net/tokenring/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "Token Ring devices"
+menuconfig TR
 	depends on NETDEVICES
-
-# So far, we only have PCI, ISA, and MCA token ring devices
-config TR
 	bool "Token Ring driver support"
+# So far, we only have PCI, ISA, and MCA token ring devices
 	depends on (PCI || ISA || MCA || CCW)
 	select LLC
@@ -182,5 +180,2 @@ config SMCTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called smctr.
-
-endmenu
-
--- rc1-a/drivers/net/pcmcia/Kconfig	2005-06-30 11:20:36.000000000 +0200
+++ rc1-b/drivers/net/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "PCMCIA network device support"
-	depends on NETDEVICES && PCMCIA!=n
-
-config NET_PCMCIA
+menuconfig NET_PCMCIA
 	bool "PCMCIA network device support"
+	depends on NETDEVICES && PCMCIA!=n
 	---help---
 	  Say Y if you would like to include support for any PCMCIA or CardBus
@@ -128,5 +126,2 @@ config PCMCIA_IBMTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called ibmtr_cs.
-
-endmenu
-
--- rc1-a/drivers/net/wireless/Kconfig	2005-06-30 11:21:45.000000000 +0200
+++ rc1-b/drivers/net/wireless/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wireless LAN (non-hamradio)"
-	depends on NETDEVICES
-
-config NET_RADIO
+menuconfig NET_RADIO
 	bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+	depends on NETDEVICES
 	---help---
 	  Support for wireless LANs and everything having to do with radio,
@@ -361,5 +359,2 @@ config NET_WIRELESS
 	depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 	default y
-
-endmenu
-
--- rc1-a/drivers/mtd/nand/Kconfig	2005-06-30 11:20:35.000000000 +0200
+++ rc1-b/drivers/mtd/nand/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -2,9 +2,10 @@
 # $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
 
-menu "NAND Flash Device Drivers"
-	depends on MTD!=n
+config MTD_NAND_IDS
+	depends on MTD
+	tristate
 
-config MTD_NAND
-	tristate "NAND Device Support"
+menuconfig MTD_NAND
+	tristate "NAND Flash Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
@@ -56,7 +57,4 @@ config MTD_NAND_TOTO
 	  Support for NAND flash on Texas Instruments Toto platform.
 
-config MTD_NAND_IDS
-	tristate
-
 config MTD_NAND_TX4925NDFMC
 	tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
@@ -204,4 +202,2 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
 	  The simulator may simulate verious NAND flash chips for the
 	  MTD nand layer.
- 
-endmenu
--- rc1-a/drivers/mtd/Kconfig	2005-06-30 11:21:42.000000000 +0200
+++ rc1-b/drivers/mtd/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,7 +1,5 @@
 # $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $
 
-menu "Memory Technology Devices (MTD)"
-
-config MTD
+menuconfig MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
@@ -261,5 +259,2 @@ source "drivers/mtd/devices/Kconfig"
 
 source "drivers/mtd/nand/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/pci/hotplug/Kconfig	2005-06-30 11:20:37.000000000 +0200
+++ rc1-b/drivers/pci/hotplug/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL
@@ -193,5 +191,2 @@ config HOTPLUG_PCI_SGI
 
 	  When in doubt, say N.
-
-endmenu
-
--- rc1-a/drivers/pnp/Kconfig	2005-06-30 11:19:30.000000000 +0200
+++ rc1-b/drivers/pnp/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Plug and Play support"
-
-config PNP
+menuconfig PNP
 	bool "Plug and Play support"
 	depends on ISA || ACPI_BUS
@@ -37,5 +35,2 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/usb/serial/Kconfig	2005-06-30 11:21:50.000000000 +0200
+++ rc1-b/drivers/usb/serial/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,5 @@
 #
 
-menu "USB Serial Converter support"
-	depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
 	depends on USB
@@ -481,4 +478,2 @@ config USB_EZUSB
 	default y
 
-endmenu
-
--- rc1-a/drivers/acpi/Kconfig	2005-06-30 11:22:22.000000000 +0200
+++ rc1-b/drivers/acpi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,13 +3,10 @@
 #
 
-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+	bool "ACPI (Advanced Configuration and Power Interface) Support"
 	depends on !X86_VISWS
 	depends on !IA64_HP_SIM
 	depends on IA64 || X86
 
-config ACPI
-	bool "ACPI Support"
-	depends on IA64 || X86
-
 	default y
 	---help---
@@ -352,4 +349,2 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
-
-endmenu
--- rc1-a/drivers/char/tpm/Kconfig	2005-06-30 11:21:32.000000000 +0200
+++ rc1-b/drivers/char/tpm/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "TPM devices"
-
-config TCG_TPM
+menuconfig TCG_TPM
 	tristate "TPM Hardware Support"
 	depends on EXPERIMENTAL && PCI
@@ -35,5 +33,2 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver 
 	  as a module, choose M here; the module will be called tpm_atmel.
-
-endmenu
-
--- rc1-a/drivers/char/ipmi/Kconfig	2005-06-30 11:20:27.000000000 +0200
+++ rc1-b/drivers/char/ipmi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,6 +3,5 @@
 #
 
-menu "IPMI"
-config IPMI_HANDLER
+menuconfig IPMI_HANDLER
        tristate 'IPMI top-level message handler'
        help
@@ -64,4 +63,2 @@ config IPMI_POWEROFF
          This enables a function to power off the system with IPMI if
 	 the IPMI management controller is capable of this.
-
-endmenu
--- rc1-a/drivers/char/watchdog/Kconfig	2005-06-30 11:22:23.000000000 +0200
+++ rc1-b/drivers/char/watchdog/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG
 	bool "Watchdog Timer Support"
 	---help---
@@ -556,4 +554,2 @@ config USBPCWATCHDOG
 
 	  Most people will say N.
-
-endmenu
--- rc1-a/drivers/isdn/hisax/Kconfig	2005-06-30 11:21:40.000000000 +0200
+++ rc1-b/drivers/isdn/hisax/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,8 +1,6 @@
 
-menu "Passive cards"
+menuconfig ISDN_DRV_HISAX
+	tristate "Passive cards (HiSax, HFC)"
 	depends on ISDN_I4L
-
-config ISDN_DRV_HISAX
-	tristate "HiSax SiemensChipSet driver support"
 	select CRC_CCITT
 	---help---
@@ -438,5 +436,2 @@ config HISAX_AVM_A1_PCMCIA
 
 endif
-
-endmenu
-
--- rc1-a/drivers/isdn/Kconfig	2004-08-14 07:38:04.000000000 +0200
+++ rc1-b/drivers/isdn/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "ISDN subsystem"
-
-config ISDN
-	tristate "ISDN support"
+menuconfig ISDN
+	tristate "ISDN subsystem"
 	depends on NET
 	---help---
@@ -63,5 +61,2 @@ source "drivers/isdn/capi/Kconfig"
 
 source "drivers/isdn/hardware/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/isdn/hardware/avm/Kconfig	2005-06-30 11:19:17.000000000 +0200
+++ rc1-b/drivers/isdn/hardware/avm/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active AVM cards"
+menuconfig CAPI_AVM
+	bool "Active AVM cards"
 	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_AVM
-	bool "Support AVM cards"
 	help
 	  Enable support for AVM active ISDN cards.
@@ -62,5 +60,2 @@ config ISDN_DRV_AVMB1_C4
 	  Enable support for the AVM C4/C2 PCI cards.
 	  These cards handle 4/2 BRI ISDN lines (8/4 channels).
-
-endmenu
-
--- rc1-a/drivers/isdn/hardware/eicon/Kconfig	2004-08-14 07:36:59.000000000 +0200
+++ rc1-b/drivers/isdn/hardware/eicon/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active Eicon DIVA Server cards"
-	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_EICON
+menuconfig CAPI_EICON
 	bool "Support Eicon cards"
+	depends on NET && ISDN && ISDN_CAPI!=n
 	help
 	  Enable support for Eicon Networks active ISDN cards.
@@ -49,5 +47,2 @@ config ISDN_DIVAS_MAINT
 	help
 	  Enable Divas Maintainance driver.
-
-endmenu
-
--- rc1-a/drivers/scsi/Kconfig	2005-06-30 11:22:39.000000000 +0200
+++ rc1-b/drivers/scsi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,5 +1,3 @@
-menu "SCSI device support"
-
-config SCSI
+menuconfig SCSI
 	tristate "SCSI device support"
 	---help---
@@ -1793,4 +1791,2 @@ endmenu
 
 source "drivers/scsi/pcmcia/Kconfig"
-
-endmenu
--- rc1-a/drivers/scsi/pcmcia/Kconfig	2004-08-14 07:37:25.000000000 +0200
+++ rc1-b/drivers/scsi/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,10 @@
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n && MODULES
 
+if SCSI_PCMCIA
+
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
@@ -80,3 +83,3 @@ config PCMCIA_SYM53C500
 	  module will be called sym53c500_cs.
 
-endmenu
+endif
--- rc1-a/drivers/infiniband/Kconfig	2005-06-30 11:20:30.000000000 +0200
+++ rc1-b/drivers/infiniband/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,5 +1,3 @@
-menu "InfiniBand support"
-
-config INFINIBAND
+menuconfig INFINIBAND
 	tristate "InfiniBand support"
 	---help---
@@ -11,4 +9,2 @@ source "drivers/infiniband/hw/mthca/Kcon
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
-
-endmenu
--- rc1-a/drivers/cdrom/Kconfig	2005-06-30 11:21:32.000000000 +0200
+++ rc1-b/drivers/cdrom/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Old CD-ROM drivers (not SCSI, not IDE)"
+menuconfig CD_NO_IDESCSI
+	bool "Old CD-ROM drivers (not SCSI, IDE or ATAPI)"
 	depends on ISA
-
-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
@@ -210,4 +208,2 @@ config CDU535
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonycd535.
-
-endmenu
--- rc1-a/drivers/media/dvb/Kconfig	2005-06-30 11:22:25.000000000 +0200
+++ rc1-b/drivers/media/dvb/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Digital Video Broadcasting Devices"
-
-config DVB
-	bool "DVB For Linux"
+menuconfig DVB
+	bool "Digital Video Broadcasting Devices"
 	depends on NET && INET
 	---help---
@@ -44,4 +42,2 @@ comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
-
-endmenu
--- rc1-a/drivers/video/logo/Kconfig	2005-06-30 11:21:52.000000000 +0200
+++ rc1-b/drivers/video/logo/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Logo configuration"
-
-config LOGO
-	bool "Bootup logo"
+menuconfig LOGO
+	bool "Bootup logo configuration"
 	depends on FB || SGI_NEWPORT_CONSOLE
 
@@ -63,5 +61,2 @@ config LOGO_SUPERH_CLUT224
 	depends on LOGO && SUPERH
 	default y
-
-endmenu
-
--- rc1-a/drivers/message/i2o/Kconfig	2005-06-30 11:22:26.000000000 +0200
+++ rc1-b/drivers/message/i2o/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,3 @@
-
-menu "I2O device support"
-
-config I2O
+menuconfig I2O
 	tristate "I2O support"
 	depends on PCI
@@ -107,5 +104,2 @@ config I2O_PROC
 	  To compile this support as a module, choose M here: the
 	  module will be called i2o_proc.
-
-endmenu
-
--- rc1-a/drivers/message/fusion/Kconfig	2005-06-30 11:22:25.000000000 +0200
+++ rc1-b/drivers/message/fusion/Kconfig	2005-06-30 11:13:57.000000000 +0200
@@ -1,4 +1,7 @@
 
-menu "Fusion MPT device support"
+menuconfig FUSION_DEVICES
+	bool "Fusion MPT device support"
+
+if FUSION_DEVICES
 
 config FUSION
@@ -84,3 +87,3 @@ config FUSION_LAN
 	  If unsure whether you really want or need this, say N.
 
-endmenu
+endif
--- rc1-a/drivers/ieee1394/Kconfig	2005-06-30 11:21:33.000000000 +0200
+++ rc1-b/drivers/ieee1394/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,7 +1,5 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support"
-
-config IEEE1394
+menuconfig IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
 	depends on PCI || BROKEN
@@ -180,4 +178,2 @@ config IEEE1394_AMDTP
 	  To compile this driver as a module, say M here: the
 	  module will be called amdtp.
-
-endmenu
--- rc1-a/drivers/pcmcia/Kconfig	2005-06-30 11:22:38.000000000 +0200
+++ rc1-b/drivers/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
 	tristate "PCCard (PCMCIA/CardBus) support"
 	select HOTPLUG
@@ -229,4 +227,2 @@ config PCCARD_NONSTATIC
 
 endif	# PCCARD
-
-endmenu
--- rc1-a/drivers/telephony/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ rc1-b/drivers/telephony/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Telephony Support"
-
-config PHONE
-	tristate "Linux telephony support"
+menuconfig PHONE
+	tristate "Telephony support"
 	---help---
 	  Say Y here if you have a telephony card, which for example allows
@@ -43,5 +41,2 @@ config PHONE_IXJ_PCMCIA
 	  cards manufactured by Quicknet Technologies, Inc.  This changes the
 	  card initialization code to work with the card manager daemon.
-
-endmenu
-
--- rc1-a/drivers/parport/Kconfig	2005-06-30 11:21:45.000000000 +0200
+++ rc1-b/drivers/parport/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
 	tristate "Parallel port support"
 	---help---
@@ -84,4 +82,5 @@ config PARPORT_PC_PCMCIA
 
 config PARPORT_NOT_PC
+	depends on PARPORT
 	bool
 
@@ -141,5 +140,2 @@ config PARPORT_1284
 	  transfer modes. Also say Y if you want device ID information to
 	  appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
-
-endmenu
-
--- rc1-a/fs/nls/Kconfig	2004-08-14 07:36:10.000000000 +0200
+++ rc1-b/fs/nls/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Native Language Support"
-
-config NLS
-	tristate "Base native language support"
+menuconfig NLS
+	tristate "Native language support"
 	---help---
 	  The base Native Language Support. A number of filesystems
@@ -501,4 +499,2 @@ config NLS_UTF8
 	  the Unicode/ISO9646 universal character set.
 
-endmenu
-
--- rc1-a/fs/xfs/Kconfig	2005-06-30 11:20:52.000000000 +0200
+++ rc1-b/fs/xfs/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,4 @@
-menu "XFS support"
-
-config XFS_FS
-	tristate "XFS filesystem support"
+menuconfig XFS_FS
+	tristate "XFS support"
 	select EXPORTFS if NFSD!=n
 	help
@@ -21,11 +19,13 @@ config XFS_FS
 	  to use an initial ramdisk (initrd) to boot.
 
+if XFS_FS
+
 config XFS_EXPORT
 	bool
-	default y if XFS_FS && EXPORTFS
+	default y if EXPORTFS
 
 config XFS_RT
 	bool "Realtime support (EXPERIMENTAL)"
-	depends on XFS_FS && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here you will be able to mount and use XFS filesystems
@@ -44,5 +44,4 @@ config XFS_RT
 config XFS_QUOTA
 	bool "Quota support"
-	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
@@ -61,5 +60,4 @@ config XFS_QUOTA
 config XFS_SECURITY
 	bool "Security Label support"
-	depends on XFS_FS
 	help
 	  Security labels support alternative access control models
@@ -73,5 +71,4 @@ config XFS_SECURITY
 config XFS_POSIX_ACL
 	bool "POSIX ACL support"
-	depends on XFS_FS
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -83,3 +80,3 @@ config XFS_POSIX_ACL
 	  If you don't know what Access Control Lists are, say N.
 
-endmenu
+endif
--- rc1-a/fs/Kconfig	2005-06-30 11:22:41.000000000 +0200
+++ rc1-b/fs/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1728,10 +1728,6 @@ config RXRPC
 endmenu
 
-menu "Partition Types"
-
 source "fs/partitions/Kconfig"
 
-endmenu
-
 source "fs/nls/Kconfig"
 
--- rc1-a/init/Kconfig	2005-06-30 11:22:50.000000000 +0200
+++ rc1-b/init/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -392,8 +392,6 @@ config BASE_SMALL
 	default 1 if !BASE_FULL
 
-menu "Loadable module support"
-
-config MODULES
-	bool "Enable loadable module support"
+menuconfig MODULES
+	bool "Loadable module support"
 	help
 	  Kernel modules are small pieces of compiled code which can
@@ -414,7 +412,8 @@ config MODULES
 	  If unsure, say Y.
 
+if MODULES
+
 config MODULE_UNLOAD
 	bool "Module unloading"
-	depends on MODULES
 	help
 	  Without this option you will not be able to unload any
@@ -436,5 +435,4 @@ config OBSOLETE_MODPARM
 	bool
 	default y
-	depends on MODULES
 	help
 	  You need this option to use module parameters on modules which
@@ -444,5 +442,5 @@ config OBSOLETE_MODPARM
 config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
-	depends on MODULES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Usually, you have to use modules compiled with your kernel.
@@ -455,5 +453,4 @@ config MODVERSIONS
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
@@ -467,5 +464,4 @@ config MODULE_SRCVERSION_ALL
 config KMOD
 	bool "Automatic kernel module loading"
-	depends on MODULES
 	help
 	  Normally when you have selected some parts of the kernel to
@@ -483,3 +479,4 @@ config STOP_MACHINE
 	help
 	  Need stop_machine() primitive.
-endmenu
+
+endif
--- rc1-a/net/sctp/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ rc1-b/net/sctp/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
-config IP_SCTP
+menuconfig IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
 	depends on IPV6 || IPV6=n
+	depends on INET && EXPERIMENTAL
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -87,3 +85,2 @@ config SCTP_HMAC_MD5
 
 endchoice
-endmenu
--- rc1-a/net/bridge/netfilter/Kconfig	2005-06-30 11:21:03.000000000 +0200
+++ rc1-b/net/bridge/netfilter/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Bridge: Netfilter Configuration"
-	depends on BRIDGE && NETFILTER
-
-config BRIDGE_NF_EBTABLES
+menuconfig BRIDGE_NF_EBTABLES
 	tristate "Ethernet Bridge tables (ebtables) support"
+	depends on BRIDGE && NETFILTER
 	help
 	  ebtables is a general, extensible frame/packet identification
@@ -208,4 +206,2 @@ config BRIDGE_EBT_ULOG
 
 	  To compile it as a module, choose M here.  If unsure, say N.
-
-endmenu
--- rc1-a/sound/Kconfig	2005-06-30 11:22:53.000000000 +0200
+++ rc1-b/sound/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -2,7 +2,5 @@
 #
 
-menu "Sound"
-
-config SOUND
+menuconfig SOUND
 	tristate "Sound card support"
 	help
@@ -33,12 +31,11 @@ config SOUND
 	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
 
+if SOUND
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 
-menu "Advanced Linux Sound Architecture"
-	depends on SOUND!=n
-
-config SND
+menuconfig SND
 	tristate "Advanced Linux Sound Architecture"
 	depends on SOUND
@@ -75,12 +72,7 @@ source "sound/sparc/Kconfig"
 source "sound/parisc/Kconfig"
 
-endmenu
-
-menu "Open Sound System"
-	depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
-
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
+	depends on SOUND && (BROKEN || (!SPARC32 && !SPARC64))
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
@@ -88,7 +80,5 @@ config SOUND_PRIME
 source "sound/oss/Kconfig"
 
-endmenu
-
 endif
 
-endmenu
+endif
 

Re: [PATCH] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

Part 2: The USB menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for 2.6.12; the patch for .13-rc1 will be posted
as a reply.



--- a/./drivers/usb/net/Kconfig	2005-06-19 14:17:06.000000000 +0200
+++ b/./drivers/usb/net/Kconfig	2005-07-04 11:27:11.000000000 +0200
@@ -2,10 +2,13 @@
 # USB Network devices configuration
 #
 comment "Networking support is needed for USB Network Adapter support"
-	depends on USB && !NET
+	depends on !NET
 
-menu "USB Network Adapters"
-	depends on USB && NET
+menuconfig USB_NET_DEVICES
+	bool "USB Network Adapters"
+	depends on NET
+
+if USB_NET_DEVICES
 
 config USB_CATC
 	tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
@@ -308,4 +311,4 @@ config USB_ZD1201
 	  To compile this driver as a module, choose M here: the
 	  module will be called zd1201.
 
-endmenu
+endif
--- a/./drivers/usb/input/Kconfig	2005-05-02 02:25:51.000000000 +0200
+++ b/./drivers/usb/input/Kconfig	2005-07-04 11:16:26.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Input driver configuration
 #
 comment "USB Input Devices"
-	depends on USB
 
 config USB_HID
 	tristate "USB Human Interface Device (full HID) support"
-	depends on USB
 	---help---
 	  Say Y here if you want full HID support to connect keyboards,
 	  mice, joysticks, graphic tablets, or any other HID based devices
--- a/./drivers/usb/Kconfig	2005-06-19 14:17:02.000000000 +0200
+++ b/./drivers/usb/Kconfig	2005-07-04 11:43:31.000000000 +0200
@@ -2,8 +2,6 @@
 # USB device configuration
 #
 
-menu "USB support"
-
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
 # NOTE:  SL-811 option should be board-specific ...
@@ -29,9 +27,12 @@ config USB_ARCH_HAS_OHCI
 	# more:
 	default PCI
 
+comment "USB (host side) may require PCI"
+	depends on !USB_ARCH_HAS_HCD && !PCI
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
-config USB
-	tristate "Support for Host-side USB"
+menuconfig USB
+	tristate "USB (host side)"
 	depends on USB_ARCH_HAS_HCD
 	---help---
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -65,6 +66,8 @@ config USB
 	  To compile this driver as a module, choose M here: the
 	  module will be called usbcore.
 
+if USB
+
 source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/host/Kconfig"
@@ -84,11 +87,10 @@ source "drivers/usb/net/Kconfig"
 source "drivers/usb/mon/Kconfig"
 
 comment "USB port drivers"
-	depends on USB
 
 config USB_USS720
 	tristate "USS720 parport driver"
-	depends on USB && PARPORT
+	depends on PARPORT
 	select PARPORT_NOT_PC
 	---help---
 	  This driver is for USB parallel port adapters that use the Lucent
@@ -121,7 +123,7 @@ source "drivers/usb/misc/Kconfig"
 
 source "drivers/usb/atm/Kconfig"
 
-source "drivers/usb/gadget/Kconfig"
+endif
 
-endmenu
+source "drivers/usb/gadget/Kconfig"
 
--- a/./drivers/usb/gadget/Kconfig	2005-06-19 14:17:04.000000000 +0200
+++ b/./drivers/usb/gadget/Kconfig	2005-07-04 11:26:11.000000000 +0200
@@ -12,10 +12,8 @@
 # With help from a special transceiver and a "Mini-AB" jack, systems with
 # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
 #
-menu "USB Gadget Support"
-
-config USB_GADGET
-	tristate "Support for USB Gadgets"
+menuconfig USB_GADGET
+	tristate "USB Gadgets (device side)"
 	help
 	   USB is a master/slave protocol, organized with one master
 	   host (such as a PC) controlling up to 127 peripheral devices.
@@ -385,5 +383,3 @@ config USB_G_SERIAL
 # - none yet
 
 endchoice
-
-endmenu
--- a/./drivers/usb/serial/Kconfig	2005-07-04 11:10:43.000000000 +0200
+++ b/./drivers/usb/serial/Kconfig	2005-07-04 11:19:53.000000000 +0200
@@ -4,7 +4,6 @@
 
 menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
-	depends on USB
 	---help---
 	  Say Y here if you have a USB device that provides normal serial
 	  ports, or acts like a serial device, and you want to connect it to
-- 
Top 100 things you don't want the sysadmin to say:
39. It is only a minor upgrade, the system should be back up in
    a few hours.  ( This is said on a monday afternoon.)

Re: [PATCH] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

Part 2: The USB menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

Patch for .13-rc1. Only offset changes compared to .12.


--- rc1-a/./drivers/usb/net/Kconfig	2005-06-30 11:21:50.000000000 +0200
+++ rc1-b/./drivers/usb/net/Kconfig	2005-07-04 11:52:34.000000000 +0200
@@ -2,10 +2,13 @@
 # USB Network devices configuration
 #
 comment "Networking support is needed for USB Network Adapter support"
-	depends on USB && !NET
+	depends on !NET
 
-menu "USB Network Adapters"
-	depends on USB && NET
+menuconfig USB_NET_DEVICES
+	bool "USB Network Adapters"
+	depends on NET
+
+if USB_NET_DEVICES
 
 config USB_CATC
 	tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
@@ -308,4 +311,4 @@ config USB_ZD1201
 	  To compile this driver as a module, choose M here: the
 	  module will be called zd1201.
 
-endmenu
+endif
--- rc1-a/./drivers/usb/input/Kconfig	2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/./drivers/usb/input/Kconfig	2005-07-04 11:52:34.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Input driver configuration
 #
 comment "USB Input Devices"
-	depends on USB
 
 config USB_HID
 	tristate "USB Human Interface Device (full HID) support"
-	depends on USB
 	---help---
 	  Say Y here if you want full HID support to connect keyboards,
 	  mice, joysticks, graphic tablets, or any other HID based devices
--- rc1-a/./drivers/usb/Kconfig	2005-06-30 11:21:48.000000000 +0200
+++ rc1-b/./drivers/usb/Kconfig	2005-07-04 11:52:34.000000000 +0200
@@ -2,8 +2,6 @@
 # USB device configuration
 #
 
-menu "USB support"
-
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
 # NOTE:  SL-811 option should be board-specific ...
@@ -29,9 +27,12 @@ config USB_ARCH_HAS_OHCI
 	# more:
 	default PCI
 
+comment "USB (host side) may require PCI"
+	depends on !USB_ARCH_HAS_HCD && !PCI
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
-config USB
-	tristate "Support for Host-side USB"
+menuconfig USB
+	tristate "USB (host side)"
 	depends on USB_ARCH_HAS_HCD
 	---help---
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -65,6 +66,8 @@ config USB
 	  To compile this driver as a module, choose M here: the
 	  module will be called usbcore.
 
+if USB
+
 source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/host/Kconfig"
@@ -84,11 +87,10 @@ source "drivers/usb/net/Kconfig"
 source "drivers/usb/mon/Kconfig"
 
 comment "USB port drivers"
-	depends on USB
 
 config USB_USS720
 	tristate "USS720 parport driver"
-	depends on USB && PARPORT
+	depends on PARPORT
 	select PARPORT_NOT_PC
 	---help---
 	  This driver is for USB parallel port adapters that use the Lucent
@@ -121,7 +123,7 @@ source "drivers/usb/misc/Kconfig"
 
 source "drivers/usb/atm/Kconfig"
 
-source "drivers/usb/gadget/Kconfig"
+endif
 
-endmenu
+source "drivers/usb/gadget/Kconfig"
 
--- rc1-a/./drivers/usb/gadget/Kconfig	2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/./drivers/usb/gadget/Kconfig	2005-07-04 11:52:34.000000000 +0200
@@ -12,10 +12,8 @@
 # With help from a special transceiver and a "Mini-AB" jack, systems with
 # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
 #
-menu "USB Gadget Support"
-
-config USB_GADGET
-	tristate "Support for USB Gadgets"
+menuconfig USB_GADGET
+	tristate "USB Gadgets (device side)"
 	help
 	   USB is a master/slave protocol, organized with one master
 	   host (such as a PC) controlling up to 127 peripheral devices.
@@ -394,5 +392,3 @@ config USB_G_SERIAL
 # - none yet
 
 endchoice
-
-endmenu
--- rc1-a/./drivers/usb/serial/Kconfig	2005-07-04 11:36:04.000000000 +0200
+++ rc1-b/./drivers/usb/serial/Kconfig	2005-07-04 11:52:34.000000000 +0200
@@ -4,7 +4,6 @@
 
 menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
-	depends on USB
 	---help---
 	  Say Y here if you have a USB device that provides normal serial
 	  ports, or acts like a serial device, and you want to connect it to
-- 
Today's assembler command: EXOP Execute Operator 

[PATCH] Kconfig changes 3: s/menu/menuconfig/ APM menu

[Bodo Eggert]

Part 3: The APM menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for 2.6.12; the patch for .13-rc1 will be posted
as a reply.


--- a/./arch/i386/Kconfig	2005-06-19 14:16:03.000000000 +0200
+++ b/./arch/i386/Kconfig	2005-07-04 12:01:27.000000000 +0200
@@ -949,12 +949,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
@@ -1011,9 +1008,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
@@ -1021,7 +1019,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
@@ -1039,7 +1036,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
@@ -1051,7 +1047,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
@@ -1065,7 +1060,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
@@ -1078,7 +1072,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
@@ -1089,13 +1082,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
 
 source "arch/i386/kernel/cpu/cpufreq/Kconfig"
 
-- 
"Violence is the last resort of the incompetent."    - Isaak Asimov (1920-1992)
"Damn straight. The competent don't wait that long." - Jerry Pournelle

[PATCH] Kconfig changes 3: s/menu/menuconfig/ APM menu

[Bodo Eggert]

On Mon, 4 Jul 2005, Bodo Eggert wrote:

Part 3: The APM menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for .13-rc1.


--- rc1-a/./arch/i386/Kconfig	2005-06-30 11:22:16.000000000 +0200
+++ rc1-b/./arch/i386/Kconfig	2005-07-04 12:09:08.000000000 +0200
@@ -987,12 +987,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
@@ -1049,9 +1046,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
@@ -1059,7 +1057,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
@@ -1077,7 +1074,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
@@ -1089,7 +1085,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
@@ -1103,7 +1098,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
@@ -1116,7 +1110,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
@@ -1127,13 +1120,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
 
 source "arch/i386/kernel/cpu/cpufreq/Kconfig"
 
-- 
Top 100 things you don't want the sysadmin to say:
66. What do you mean you needed that directory?

[PATCH] Kconfig changes 4: s/menu/menuconfig/ CPU scaling menu

[Bodo Eggert]

On Mon, 4 Jul 2005, Bodo Eggert wrote:

Part 4: The CPU scaling menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for 2.6.12 , the patch for .13-rc1 will be sent in 
a reply



--- a/./arch/sh/Kconfig	2005-06-19 14:16:18.000000000 +0200
+++ b/./arch/sh/Kconfig	2005-07-04 12:36:57.000000000 +0200
@@ -655,8 +655,6 @@ config SH_PCLK_FREQ
 	  with an auto-probed frequency which should be considered the proper
 	  value for your hardware.
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 config SH_CPU_FREQ
@@ -671,8 +669,6 @@ config SH_CPU_FREQ
 
 	  If unsure, say N.
 
-endmenu
-
 source "arch/sh/drivers/dma/Kconfig"
 
 source "arch/sh/cchips/Kconfig"
--- a/./arch/arm/Kconfig	2005-06-19 14:15:59.000000000 +0200
+++ b/./arch/arm/Kconfig	2005-07-04 12:37:23.000000000 +0200
@@ -491,8 +491,6 @@ endmenu
 
 if (ARCH_SA1100 || ARCH_INTEGRATOR)
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_SA1100
@@ -516,8 +514,6 @@ config CPU_FREQ_INTEGRATOR
 
 	  If in doubt, say Y.
 
-endmenu
-
 endif
 
 menu "Floating point emulation"
--- a/./arch/i386/kernel/cpu/cpufreq/Kconfig	2005-06-19 14:16:03.000000000 +0200
+++ b/./arch/i386/kernel/cpu/cpufreq/Kconfig	2005-07-04 12:27:46.000000000 +0200
@@ -2,8 +2,6 @@
 # CPU Frequency scaling
 #
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 if CPU_FREQ
@@ -239,5 +237,3 @@ config X86_SPEEDSTEP_RELAXED_CAP_CHECK
 	  parameter "relaxed_check=1" is passed to the module.
 
 endif	# CPU_FREQ
-
-endmenu
--- a/./arch/x86_64/kernel/cpufreq/Kconfig	2005-06-19 14:16:25.000000000 +0200
+++ b/./arch/x86_64/kernel/cpufreq/Kconfig	2005-07-04 12:28:05.000000000 +0200
@@ -2,8 +2,6 @@
 # CPU Frequency scaling
 #
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 if CPU_FREQ
@@ -92,5 +90,3 @@ config X86_SPEEDSTEP_LIB
 
 endif
 
-endmenu
-
-- 
To steal information from a person is called plagiarism. To steal
information from the enemy is called gathering intelligence.

[PATCH] Kconfig changes 4: s/menu/menuconfig/ CPU scaling menu

[Bodo Eggert]

Part 4: The CPU scaling menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for 2.6.13-rc1


--- rc1-a/./arch/sh/Kconfig	2005-06-30 11:22:17.000000000 +0200
+++ rc1-b/./arch/sh/Kconfig	2005-07-04 12:39:29.000000000 +0200
@@ -657,8 +657,6 @@ config SH_PCLK_FREQ
 	  with an auto-probed frequency which should be considered the proper
 	  value for your hardware.
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 config SH_CPU_FREQ
@@ -673,8 +671,6 @@ config SH_CPU_FREQ
 
 	  If unsure, say N.
 
-endmenu
-
 source "arch/sh/drivers/dma/Kconfig"
 
 source "arch/sh/cchips/Kconfig"
--- rc1-a/./arch/arm/Kconfig	2005-06-30 11:22:15.000000000 +0200
+++ rc1-b/./arch/arm/Kconfig	2005-07-04 12:39:29.000000000 +0200
@@ -516,8 +516,6 @@ endmenu
 
 if (ARCH_SA1100 || ARCH_INTEGRATOR)
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_SA1100
@@ -541,8 +539,6 @@ config CPU_FREQ_INTEGRATOR
 
 	  If in doubt, say Y.
 
-endmenu
-
 endif
 
 menu "Floating point emulation"
--- rc1-a/./arch/i386/kernel/cpu/cpufreq/Kconfig	2005-06-30 11:21:18.000000000 +0200
+++ rc1-b/./arch/i386/kernel/cpu/cpufreq/Kconfig	2005-07-04 12:39:29.000000000 +0200
@@ -2,8 +2,6 @@
 # CPU Frequency scaling
 #
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 if CPU_FREQ
@@ -239,5 +237,3 @@ config X86_SPEEDSTEP_RELAXED_CAP_CHECK
 	  parameter "relaxed_check=1" is passed to the module.
 
 endif	# CPU_FREQ
-
-endmenu
--- rc1-a/./arch/x86_64/kernel/cpufreq/Kconfig	2005-06-30 11:21:31.000000000 +0200
+++ rc1-b/./arch/x86_64/kernel/cpufreq/Kconfig	2005-07-04 12:39:29.000000000 +0200
@@ -2,8 +2,6 @@
 # CPU Frequency scaling
 #
 
-menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
 
 if CPU_FREQ
@@ -92,5 +90,3 @@ config X86_SPEEDSTEP_LIB
 
 endif
 
-endmenu
-

-- 
Top 100 things you don't want the sysadmin to say:
97. Go get your backup tape. (You _do_ have a backup tape?)

Re: [PATCH] Kconfig changes 4: s/menu/menuconfig/ profiling menu

[Bodo Eggert]

Part 4: The profiling menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch is designed for 2.6.12 and .13-rc1


--- a/./arch/sh/oprofile/Kconfig	2004-08-14 07:36:14.000000000 +0200
+++ b/./arch/sh/oprofile/Kconfig	2005-07-04 12:45:58.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -19,5 +16,3 @@ config OPROFILE
 
 	  If unsure, say N.
 
-endmenu
-
--- a/./arch/arm/oprofile/Kconfig	2004-08-14 07:36:57.000000000 +0200
+++ b/./arch/arm/oprofile/Kconfig	2005-07-04 12:46:17.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/ppc/oprofile/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/./arch/ppc/oprofile/Kconfig	2005-07-04 12:46:35.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/i386/oprofile/Kconfig	2004-08-14 07:36:59.000000000 +0200
+++ b/./arch/i386/oprofile/Kconfig	2005-07-04 12:46:56.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/m32r/oprofile/Kconfig	2005-05-02 02:23:53.000000000 +0200
+++ b/./arch/m32r/oprofile/Kconfig	2005-07-04 12:47:10.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/ia64/oprofile/Kconfig	2005-05-02 02:23:53.000000000 +0200
+++ b/./arch/ia64/oprofile/Kconfig	2005-07-04 12:47:27.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -21,6 +18,3 @@ config OPROFILE
 	  counters.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/mips/oprofile/Kconfig	2005-05-02 02:25:32.000000000 +0200
+++ b/./arch/mips/oprofile/Kconfig	2005-07-04 12:47:42.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/s390/oprofile/Kconfig	2005-06-19 14:16:18.000000000 +0200
+++ b/./arch/s390/oprofile/Kconfig	2005-07-04 12:47:56.000000000 +0200
@@ -1,7 +1,4 @@
-
-menu "Profiling support"
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support"
 	help
 	  Say Y here to enable profiling support mechanisms used by
@@ -17,6 +14,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/sh64/oprofile/Kconfig	2004-08-14 07:36:12.000000000 +0200
+++ b/./arch/sh64/oprofile/Kconfig	2005-07-04 12:48:09.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/alpha/oprofile/Kconfig	2004-08-14 07:36:56.000000000 +0200
+++ b/./arch/alpha/oprofile/Kconfig	2005-07-04 12:48:23.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/ppc64/oprofile/Kconfig	2004-08-14 07:36:17.000000000 +0200
+++ b/./arch/ppc64/oprofile/Kconfig	2005-07-04 12:48:40.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/sparc64/oprofile/Kconfig	2004-08-14 07:37:55.000000000 +0200
+++ b/./arch/sparc64/oprofile/Kconfig	2005-07-04 12:48:55.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/parisc/oprofile/Kconfig	2004-08-14 07:37:38.000000000 +0200
+++ b/./arch/parisc/oprofile/Kconfig	2005-07-04 12:49:10.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
--- a/./arch/x86_64/oprofile/Kconfig	2004-08-14 07:37:25.000000000 +0200
+++ b/./arch/x86_64/oprofile/Kconfig	2005-07-04 12:49:23.000000000 +0200
@@ -1,9 +1,6 @@
-
-menu "Profiling support"
-	depends on EXPERIMENTAL
-
-config PROFILING
+menuconfig PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	help
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
@@ -18,6 +15,3 @@ config OPROFILE
 	  and applications.
 
 	  If unsure, say N.
-
-endmenu
-
-- 
Top 100 things you don't want the sysadmin to say:
85. It didn't do that a minute ago...

Re: [PATCH] Kconfig changes 4: s/menu/menuconfig/ CPU scaling menu

[Russell King]

On Mon, Jul 04, 2005 at 12:43:56PM +0200, Bodo Eggert wrote:
> Part 4: The CPU scaling menu.
> 
> In many config submenus, the first menu option will enable the rest 
> of the menu options. For these menus, It's appropriate to use the more 
> convenient "menuconfig" keyword.
> 
> This patch is designed for 2.6.13-rc1

This is inappropriate for ARM - take a look at the ARM Kconfig file
around those lines which you deleted.  You'll notice that ARM contains
some extra options for cpufreq which aren't offered on other
architectures.

These options should appear under the cpufreq menu, and making this
change means that they no longer do so.

> --- rc1-a/./arch/arm/Kconfig	2005-06-30 11:22:15.000000000 +0200
> +++ rc1-b/./arch/arm/Kconfig	2005-07-04 12:39:29.000000000 +0200
> @@ -516,8 +516,6 @@ endmenu
>  
>  if (ARCH_SA1100 || ARCH_INTEGRATOR)
>  
> -menu "CPU Frequency scaling"
> -
>  source "drivers/cpufreq/Kconfig"
>  
>  config CPU_FREQ_SA1100
> @@ -541,8 +539,6 @@ config CPU_FREQ_INTEGRATOR
>  
>  	  If in doubt, say Y.
>  
> -endmenu
> -
>  endif
>  
>  menu "Floating point emulation"

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [PATCH] Kconfig changes: s/menu/menuconfig/

[Sam Ravnborg]

On Thu, Jun 30, 2005 at 11:06:01PM +0200, Bodo Eggert wrote:
> Part 1: The easy stuff.
> 
> In many config submenus, the first menu option will enable the rest 
> of the menu options. For these menus, It's appropriate to use the more 
> convenient "menuconfig" keyword.

Please do not touch net/Kconfig and friends. I am preparing an
update of this part so it will conflict.

	Sam

Re: [PATCH] Kconfig changes 4: s/menu/menuconfig/ CPU scaling menu

[Bodo Eggert]

On Mon, 4 Jul 2005, Russell King wrote:
> On Mon, Jul 04, 2005 at 12:43:56PM +0200, Bodo Eggert wrote:
> > Part 4: The CPU scaling menu.
> > 
> > In many config submenus, the first menu option will enable the rest 
> > of the menu options. For these menus, It's appropriate to use the more 
> > convenient "menuconfig" keyword.
> > 
> > This patch is designed for 2.6.13-rc1
> 
> This is inappropriate for ARM - take a look at the ARM Kconfig file
> around those lines which you deleted.  You'll notice that ARM contains
> some extra options for cpufreq which aren't offered on other
> architectures.
> 
> These options should appear under the cpufreq menu, and making this
> change means that they no longer do so.

My script missed some changes (Shouldn't be possible). I'll post the 
missing parts, which will restore the desired behaviour.

The update will change the main CPU scaling config to menuconfig,
and all other options will be added to the menu because they depend on 
that config.
-- 
Justify my text? I'm sorry but it has no excuse. 

[PATCH][Update] Kconfig changes 2b: s/menu/menuconfig/ USB menu

[Bodo Eggert]

Part 2b: The USB menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch includes the missing changes from the previous patch


--- x/drivers/usb/atm/Kconfig	2005-07-04 13:48:02.000000000 +0200
+++ b/drivers/usb/atm/Kconfig	2005-07-04 11:20:46.000000000 +0200
@@ -2,11 +2,10 @@
 # USB ATM driver configuration
 #
 comment "USB ATM/DSL drivers"
-	depends on USB
 
 config USB_ATM
 	tristate "Generic USB ATM/DSL core I/O support"
-	depends on USB && ATM
+	depends on ATM
 	select CRC32
 	default n
 	help
@@ -18,7 +17,7 @@ config USB_ATM
 
 config USB_SPEEDTOUCH
 	tristate "Alcatel Speedtouch USB support"
-	depends on USB && ATM
+	depends on ATM
 	select USB_ATM
 	help
 	  Say Y here if you have an Alcatel SpeedTouch USB or SpeedTouch 330
--- x/drivers/usb/class/Kconfig	2005-07-04 13:48:02.000000000 +0200
+++ b/drivers/usb/class/Kconfig	2005-07-04 11:15:30.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Class driver configuration
 #
 comment "USB Device Class drivers"
-	depends on USB
 
 config USB_AUDIO
 	tristate "USB Audio support"
-	depends on USB && SOUND
+	depends on SOUND
 	help
 	  Say Y here if you want to connect USB audio equipment such as
 	  speakers to your computer's USB port. You only need this if you use
@@ -16,11 +15,11 @@ config USB_AUDIO
 	  module will be called audio.
 
 comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem"
-	depends on USB && BT
+	depends on BT
 
 config USB_BLUETOOTH_TTY
 	tristate "USB Bluetooth TTY support"
-	depends on USB && BT=n
+	depends on BT=n
 	---help---
 	  This driver implements a nonstandard tty interface to a Bluetooth
 	  device that can be used only by specialized Bluetooth HCI software.
@@ -40,7 +39,7 @@ config USB_BLUETOOTH_TTY
 
 config USB_MIDI
 	tristate "USB MIDI support"
-	depends on USB && SOUND
+	depends on SOUND
 	---help---
 	  Say Y here if you want to connect a USB MIDI device to your
 	  computer's USB port. This driver is for devices that comply with
@@ -61,7 +60,6 @@ config USB_MIDI
 
 config USB_ACM
 	tristate "USB Modem (CDC ACM) support"
-	depends on USB
 	---help---
 	  This driver supports USB modems and ISDN adapters which support the
 	  Communication Device Class Abstract Control Model interface.
@@ -76,7 +74,6 @@ config USB_ACM
 
 config USB_PRINTER
 	tristate "USB Printer support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a USB printer to your computer's
 	  USB port.
--- x/drivers/usb/core/Kconfig	2005-07-04 13:46:37.000000000 +0200
+++ b/drivers/usb/core/Kconfig	2005-07-04 11:14:15.000000000 +0200
@@ -3,18 +3,15 @@
 #
 config USB_DEBUG
 	bool "USB verbose debug messages"
-	depends on USB
 	help
 	  Say Y here if you want the USB core & hub drivers to produce a bunch
 	  of debug messages to the system log. Select this if you are having a
 	  problem with USB support and want to see more of what is going on.
 
 comment "Miscellaneous USB options"
-	depends on USB
 
 config USB_DEVICEFS
 	bool "USB device filesystem"
-	depends on USB
 	---help---
 	  If you say Y here (and to "/proc file system support" in the "File
 	  systems" section, above), you will get a file /proc/bus/usb/devices
@@ -38,7 +35,7 @@ config USB_DEVICEFS
 
 config USB_BANDWIDTH
 	bool "Enforce USB bandwidth allocation (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here, the USB subsystem enforces USB bandwidth
 	  allocation and will prevent some device opens from succeeding
@@ -51,7 +48,7 @@ config USB_BANDWIDTH
 
 config USB_DYNAMIC_MINORS
 	bool "Dynamic USB minor allocation (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here, the USB subsystem will use dynamic minor
 	  allocation for any device that uses the USB major number.
@@ -62,7 +59,7 @@ config USB_DYNAMIC_MINORS
 
 config USB_SUSPEND
 	bool "USB suspend/resume (EXPERIMENTAL)"
-	depends on USB && PM && EXPERIMENTAL
+	depends on PM && EXPERIMENTAL
 	help
 	  If you say Y here, you can use driver calls or the sysfs
 	  "power/state" file to suspend or resume individual USB
@@ -75,7 +72,7 @@ config USB_SUSPEND
 
 config USB_OTG
 	bool
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	select USB_SUSPEND
 	default n
 
--- x/drivers/usb/host/Kconfig	2005-07-04 13:50:28.000000000 +0200
+++ b/drivers/usb/host/Kconfig	2005-07-04 11:14:55.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Host Controller Drivers
 #
 comment "USB Host Controller Drivers"
-	depends on USB
 
 config USB_EHCI_HCD
 	tristate "EHCI HCD (USB 2.0) support"
-	depends on USB && PCI
+	depends on PCI
 	---help---
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
 	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -51,7 +50,7 @@ config USB_EHCI_ROOT_HUB_TT
 
 config USB_OHCI_HCD
 	tristate "OHCI HCD support"
-	depends on USB && USB_ARCH_HAS_OHCI
+	depends on USB_ARCH_HAS_OHCI
 	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
 	---help---
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -97,7 +96,7 @@ config USB_OHCI_LITTLE_ENDIAN
 
 config USB_UHCI_HCD
 	tristate "UHCI HCD (most Intel and VIA) support"
-	depends on USB && PCI
+	depends on PCI
 	---help---
 	  The Universal Host Controller Interface is a standard by Intel for
 	  accessing the USB hardware in the PC (which is also called the USB
@@ -113,7 +112,6 @@ config USB_UHCI_HCD
 
 config USB_SL811_HCD
 	tristate "SL811HS HCD support"
-	depends on USB
 	default N
 	help
 	  The SL811HS is a single-port USB controller that supports either
--- x/drivers/usb/image/Kconfig	2005-07-04 13:50:28.000000000 +0200
+++ b/drivers/usb/image/Kconfig	2005-07-04 11:16:46.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Imageing devices configuration
 #
 comment "USB Imaging devices"
-	depends on USB
 
 config USB_MDC800
 	tristate "USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	---help---
 	  Say Y here if you want to connect this type of still camera to
 	  your computer's USB port. This driver can be used with gphoto 0.4.3
@@ -19,7 +18,7 @@ config USB_MDC800
 
 config USB_MICROTEK
 	tristate "Microtek X6USB scanner support"
-	depends on USB && SCSI
+	depends on SCSI
 	help
 	  Say Y here if you want support for the Microtek X6USB and
 	  possibly the Phantom 336CX, Phantom C6 and ScanMaker V6U(S)L.
--- x/drivers/usb/media/Kconfig	2005-07-04 13:50:28.000000000 +0200
+++ b/drivers/usb/media/Kconfig	2005-07-04 11:17:15.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Multimedia device configuration
 #
 comment "USB Multimedia devices"
-	depends on USB
 
 config USB_DABUSB
 	tristate "DABUSB driver"
-	depends on USB
 	---help---
 	  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
 	  brought to you by the DAB-Team
@@ -19,11 +17,11 @@ config USB_DABUSB
 	  module will be called dabusb.
 
 comment "Video4Linux support is needed for USB Multimedia device support"
-	depends on USB && VIDEO_DEV=n
+	depends on VIDEO_DEV=n
 
 config USB_VICAM
 	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-	depends on USB && VIDEO_DEV && EXPERIMENTAL
+	depends on VIDEO_DEV && EXPERIMENTAL
 	---help---
 	  Say Y here if you have 3com homeconnect camera (vicam).
 
@@ -37,7 +35,7 @@ config USB_VICAM
 
 config USB_DSBR
 	tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-	depends on USB && VIDEO_DEV && EXPERIMENTAL
+	depends on VIDEO_DEV && EXPERIMENTAL
 	---help---
 	  Say Y here if you want to connect this type of radio to your
 	  computer's USB port. Note that the audio is not digital, and
@@ -55,7 +53,7 @@ config USB_DSBR
 
 config USB_IBMCAM
 	tristate "USB IBM (Xirlink) C-it Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect a IBM "C-It" camera, also known as
 	  "Xirlink PC Camera" to your computer's USB port.  For more
@@ -76,7 +74,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
 	tristate "USB Konica Webcam support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want support for webcams based on a Konica
 	  chipset. This is known to work with the Intel YC76 webcam.
@@ -92,7 +90,7 @@ config USB_KONICAWC
 
 config USB_OV511
 	tristate "USB OV511 Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. See <file:Documentation/usb/ov511.txt> for more
@@ -108,7 +106,7 @@ config USB_OV511
 
 config USB_SE401
 	tristate "USB SE401 Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. See <file:Documentation/usb/se401.txt> for more
@@ -124,7 +122,7 @@ config USB_SE401
 
 config USB_SN9C102
 	tristate "USB SN9C10x PC Camera Controller support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want support for cameras based on SONiX SN9C101,
 	  SN9C102 or SN9C103 PC Camera Controllers.
@@ -139,7 +137,7 @@ config USB_SN9C102
 
 config USB_STV680
 	tristate "USB STV680 (Pencam) Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. This includes the Pencam line of cameras.
@@ -156,7 +154,7 @@ config USB_STV680
 
 config USB_W9968CF
 	tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-	depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
+	depends on VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
 	---help---
 	  Say Y here if you want support for cameras based on OV681 or
 	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
@@ -178,7 +176,7 @@ config USB_W9968CF
 
 config USB_PWC
 	tristate "USB Philips Cameras"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y or M here if you want to use one of these Philips & OEM
           webcams:
--- x/drivers/usb/misc/Kconfig	2005-07-04 13:50:28.000000000 +0200
+++ b/drivers/usb/misc/Kconfig	2005-07-04 11:20:24.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Miscellaneous driver configuration
 #
 comment "USB Miscellaneous drivers"
-	depends on USB
 
 config USB_EMI62
 	tristate "EMI 6|2m USB Audio interface support"
-	depends on USB
 	---help---
 	  This driver loads firmware to Emagic EMI 6|2m low latency USB
 	  Audio and Midi interface.
@@ -21,7 +19,6 @@ config USB_EMI62
 
 config USB_EMI26
 	tristate "EMI 2|6 USB Audio interface support"
-	depends on USB
 	---help---
 	  This driver loads firmware to Emagic EMI 2|6 low latency USB
 	  Audio interface.
@@ -34,7 +31,7 @@ config USB_EMI26
 
 config USB_AUERSWALD
 	tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect an Auerswald USB ISDN Device
 	  to your computer's USB port.
@@ -44,7 +41,7 @@ config USB_AUERSWALD
 
 config USB_RIO500
 	tristate "USB Diamond Rio500 support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect a USB Rio500 mp3 player to your
 	  computer's USB port. Please read <file:Documentation/usb/rio.txt>
@@ -55,7 +52,7 @@ config USB_RIO500
 
 config USB_LEGOTOWER
 	tristate "USB Lego Infrared Tower support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect a USB Lego Infrared Tower to your
 	  computer's USB port.
@@ -68,7 +65,6 @@ config USB_LEGOTOWER
 
 config USB_LCD
 	tristate "USB LCD driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an USBLCD to your computer's
 	  USB port. The USBLCD is a small USB interface board for
@@ -80,7 +76,6 @@ config USB_LCD
 
 config USB_LED
 	tristate "USB LED driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an USBLED device to your 
 	  computer's USB port.
@@ -90,7 +85,6 @@ config USB_LED
 
 config USB_CYTHERM
 	tristate "Cypress USB thermometer driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a Cypress USB thermometer
 	  device to your computer's USB port. This device is also known
@@ -103,7 +97,6 @@ config USB_CYTHERM
 
 config USB_PHIDGETKIT
 	tristate "USB PhidgetKit support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a PhidgetKit USB device from
 	  Phidgets Inc.
@@ -113,7 +106,6 @@ config USB_PHIDGETKIT
 
 config USB_PHIDGETSERVO
 	tristate "USB PhidgetServo support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an 1 or 4 Motor PhidgetServo 
 	  servo controller version 2.0 or 3.0.
@@ -125,7 +117,6 @@ config USB_PHIDGETSERVO
 
 config USB_IDMOUSE
 	tristate "Siemens ID USB Mouse Fingerprint sensor support"
-	depends on USB
 	help
 	  Say Y here if you want to use the fingerprint sensor on
 	  the Siemens ID Mouse. There is also a Siemens ID Mouse
@@ -141,7 +132,7 @@ source "drivers/usb/misc/sisusbvga/Kconf
 
 config USB_TEST
 	tristate "USB testing driver (DEVELOPMENT)"
-	depends on USB && USB_DEVICEFS && EXPERIMENTAL
+	depends on USB_DEVICEFS && EXPERIMENTAL
 	help
 	  This driver is for testing host controller software.  It is used
 	  with specialized device firmware for regression and stress testing,
--- x/drivers/usb/mon/Kconfig	2005-07-04 13:50:28.000000000 +0200
+++ b/drivers/usb/mon/Kconfig	2005-07-04 11:18:16.000000000 +0200
@@ -8,7 +8,6 @@
 # and for those who have usbcore as a module.
 config USB_MON
 	tristate "USB Monitor"
-	depends on USB
 	default y
 	help
 	  If you say Y here, a component which captures the USB traffic
--- x/drivers/usb/storage/Kconfig	2005-07-04 13:50:29.000000000 +0200
+++ b/drivers/usb/storage/Kconfig	2005-07-04 11:16:04.000000000 +0200
@@ -3,11 +3,9 @@
 #
 
 comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information"
-	depends on USB
 
 config USB_STORAGE
 	tristate "USB Mass Storage support"
-	depends on USB
 	select SCSI
 	---help---
 	  Say Y here if you want to connect USB mass storage devices to your
-- 
Funny quotes:
6. I feel like I'm diagonally parked in a parallel universe.

[PATCH][Update] Kconfig changes 2b: s/menu/menuconfig/ USB menu

[Bodo Eggert]

Part 2b: The USB menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

Patch for .13-rc1.

This patch includes the missing changes from the previous patch


--- rc1-a/drivers/usb/atm/Kconfig	2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/drivers/usb/atm/Kconfig	2005-07-04 14:18:19.000000000 +0200
@@ -2,12 +2,9 @@
 # USB/ATM DSL configuration
 #
 
-menu "USB DSL modem support"
-	depends on USB
-
-config USB_ATM
+menuconfig USB_ATM
 	tristate "USB DSL modem support"
-	depends on USB && ATM
+	depends on ATM
 	select CRC32
 	default n
 	help
@@ -56,5 +53,3 @@ config USB_XUSBATM
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called xusbatm.
-
-endmenu
--- rc1-a/drivers/usb/mon/Kconfig	2005-06-30 11:22:41.000000000 +0200
+++ rc1-b/drivers/usb/mon/Kconfig	2005-07-04 14:16:55.000000000 +0200
@@ -4,7 +4,6 @@
 
 config USB_MON
 	bool "USB Monitor"
-	depends on USB!=n
 	default y
 	help
 	  If you say Y here, a component which captures the USB traffic
--- rc1-a/drivers/usb/core/Kconfig	2005-06-30 11:18:17.000000000 +0200
+++ rc1-b/drivers/usb/core/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -3,18 +3,15 @@
 #
 config USB_DEBUG
 	bool "USB verbose debug messages"
-	depends on USB
 	help
 	  Say Y here if you want the USB core & hub drivers to produce a bunch
 	  of debug messages to the system log. Select this if you are having a
 	  problem with USB support and want to see more of what is going on.
 
 comment "Miscellaneous USB options"
-	depends on USB
 
 config USB_DEVICEFS
 	bool "USB device filesystem"
-	depends on USB
 	---help---
 	  If you say Y here (and to "/proc file system support" in the "File
 	  systems" section, above), you will get a file /proc/bus/usb/devices
@@ -38,7 +35,7 @@ config USB_DEVICEFS
 
 config USB_BANDWIDTH
 	bool "Enforce USB bandwidth allocation (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here, the USB subsystem enforces USB bandwidth
 	  allocation and will prevent some device opens from succeeding
@@ -51,7 +48,7 @@ config USB_BANDWIDTH
 
 config USB_DYNAMIC_MINORS
 	bool "Dynamic USB minor allocation (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here, the USB subsystem will use dynamic minor
 	  allocation for any device that uses the USB major number.
@@ -62,7 +59,7 @@ config USB_DYNAMIC_MINORS
 
 config USB_SUSPEND
 	bool "USB suspend/resume (EXPERIMENTAL)"
-	depends on USB && PM && EXPERIMENTAL
+	depends on PM && EXPERIMENTAL
 	help
 	  If you say Y here, you can use driver calls or the sysfs
 	  "power/state" file to suspend or resume individual USB
@@ -75,7 +72,7 @@ config USB_SUSPEND
 
 config USB_OTG
 	bool
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	select USB_SUSPEND
 	default n
 
--- rc1-a/drivers/usb/host/Kconfig	2005-06-30 11:22:40.000000000 +0200
+++ rc1-b/drivers/usb/host/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Host Controller Drivers
 #
 comment "USB Host Controller Drivers"
-	depends on USB
 
 config USB_EHCI_HCD
 	tristate "EHCI HCD (USB 2.0) support"
-	depends on USB && PCI
+	depends on PCI
 	---help---
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
 	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -64,7 +63,7 @@ config USB_ISP116X_HCD
 
 config USB_OHCI_HCD
 	tristate "OHCI HCD support"
-	depends on USB && USB_ARCH_HAS_OHCI
+	depends on USB_ARCH_HAS_OHCI
 	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
 	---help---
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -110,7 +109,7 @@ config USB_OHCI_LITTLE_ENDIAN
 
 config USB_UHCI_HCD
 	tristate "UHCI HCD (most Intel and VIA) support"
-	depends on USB && PCI
+	depends on PCI
 	---help---
 	  The Universal Host Controller Interface is a standard by Intel for
 	  accessing the USB hardware in the PC (which is also called the USB
@@ -126,7 +125,6 @@ config USB_UHCI_HCD
 
 config USB_SL811_HCD
 	tristate "SL811HS HCD support"
-	depends on USB
 	default N
 	help
 	  The SL811HS is a single-port USB controller that supports either
--- rc1-a/drivers/usb/misc/Kconfig	2005-06-30 11:21:49.000000000 +0200
+++ rc1-b/drivers/usb/misc/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Miscellaneous driver configuration
 #
 comment "USB Miscellaneous drivers"
-	depends on USB
 
 config USB_EMI62
 	tristate "EMI 6|2m USB Audio interface support"
-	depends on USB
 	---help---
 	  This driver loads firmware to Emagic EMI 6|2m low latency USB
 	  Audio and Midi interface.
@@ -21,7 +19,6 @@ config USB_EMI62
 
 config USB_EMI26
 	tristate "EMI 2|6 USB Audio interface support"
-	depends on USB
 	---help---
 	  This driver loads firmware to Emagic EMI 2|6 low latency USB
 	  Audio interface.
@@ -34,7 +31,7 @@ config USB_EMI26
 
 config USB_AUERSWALD
 	tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect an Auerswald USB ISDN Device
 	  to your computer's USB port.
@@ -44,7 +41,7 @@ config USB_AUERSWALD
 
 config USB_RIO500
 	tristate "USB Diamond Rio500 support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect a USB Rio500 mp3 player to your
 	  computer's USB port. Please read <file:Documentation/usb/rio.txt>
@@ -55,7 +52,7 @@ config USB_RIO500
 
 config USB_LEGOTOWER
 	tristate "USB Lego Infrared Tower support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Say Y here if you want to connect a USB Lego Infrared Tower to your
 	  computer's USB port.
@@ -68,7 +65,6 @@ config USB_LEGOTOWER
 
 config USB_LCD
 	tristate "USB LCD driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an USBLCD to your computer's
 	  USB port. The USBLCD is a small USB interface board for
@@ -80,7 +76,6 @@ config USB_LCD
 
 config USB_LED
 	tristate "USB LED driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an USBLED device to your 
 	  computer's USB port.
@@ -90,7 +85,6 @@ config USB_LED
 
 config USB_CYTHERM
 	tristate "Cypress USB thermometer driver support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a Cypress USB thermometer
 	  device to your computer's USB port. This device is also known
@@ -103,7 +97,6 @@ config USB_CYTHERM
 
 config USB_PHIDGETKIT
 	tristate "USB PhidgetKit support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a PhidgetKit USB device from
 	  Phidgets Inc.
@@ -113,7 +106,6 @@ config USB_PHIDGETKIT
 
 config USB_PHIDGETSERVO
 	tristate "USB PhidgetServo support"
-	depends on USB
 	help
 	  Say Y here if you want to connect an 1 or 4 Motor PhidgetServo 
 	  servo controller version 2.0 or 3.0.
@@ -125,7 +117,6 @@ config USB_PHIDGETSERVO
 
 config USB_IDMOUSE
 	tristate "Siemens ID USB Mouse Fingerprint sensor support"
-	depends on USB
 	help
 	  Say Y here if you want to use the fingerprint sensor on
 	  the Siemens ID Mouse. There is also a Siemens ID Mouse
@@ -141,7 +132,7 @@ source "drivers/usb/misc/sisusbvga/Kconf
 
 config USB_TEST
 	tristate "USB testing driver (DEVELOPMENT)"
-	depends on USB && USB_DEVICEFS && EXPERIMENTAL
+	depends on USB_DEVICEFS && EXPERIMENTAL
 	help
 	  This driver is for testing host controller software.  It is used
 	  with specialized device firmware for regression and stress testing,
--- rc1-a/drivers/usb/class/Kconfig	2005-06-30 11:19:37.000000000 +0200
+++ rc1-b/drivers/usb/class/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Class driver configuration
 #
 comment "USB Device Class drivers"
-	depends on USB
 
 config USB_AUDIO
 	tristate "USB Audio support"
-	depends on USB && SOUND
+	depends on SOUND
 	help
 	  Say Y here if you want to connect USB audio equipment such as
 	  speakers to your computer's USB port. You only need this if you use
@@ -16,11 +15,11 @@ config USB_AUDIO
 	  module will be called audio.
 
 comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem"
-	depends on USB && BT
+	depends on BT
 
 config USB_BLUETOOTH_TTY
 	tristate "USB Bluetooth TTY support"
-	depends on USB && BT=n
+	depends on BT=n
 	---help---
 	  This driver implements a nonstandard tty interface to a Bluetooth
 	  device that can be used only by specialized Bluetooth HCI software.
@@ -40,7 +39,7 @@ config USB_BLUETOOTH_TTY
 
 config USB_MIDI
 	tristate "USB MIDI support"
-	depends on USB && SOUND
+	depends on SOUND
 	---help---
 	  Say Y here if you want to connect a USB MIDI device to your
 	  computer's USB port. This driver is for devices that comply with
@@ -61,7 +60,6 @@ config USB_MIDI
 
 config USB_ACM
 	tristate "USB Modem (CDC ACM) support"
-	depends on USB
 	---help---
 	  This driver supports USB modems and ISDN adapters which support the
 	  Communication Device Class Abstract Control Model interface.
@@ -76,7 +74,6 @@ config USB_ACM
 
 config USB_PRINTER
 	tristate "USB Printer support"
-	depends on USB
 	help
 	  Say Y here if you want to connect a USB printer to your computer's
 	  USB port.
--- rc1-a/drivers/usb/image/Kconfig	2005-06-30 11:21:49.000000000 +0200
+++ rc1-b/drivers/usb/image/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -2,11 +2,10 @@
 # USB Imageing devices configuration
 #
 comment "USB Imaging devices"
-	depends on USB
 
 config USB_MDC800
 	tristate "USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	---help---
 	  Say Y here if you want to connect this type of still camera to
 	  your computer's USB port. This driver can be used with gphoto 0.4.3
@@ -19,7 +18,7 @@ config USB_MDC800
 
 config USB_MICROTEK
 	tristate "Microtek X6USB scanner support"
-	depends on USB && SCSI
+	depends on SCSI
 	help
 	  Say Y here if you want support for the Microtek X6USB and
 	  possibly the Phantom 336CX, Phantom C6 and ScanMaker V6U(S)L.
--- rc1-a/drivers/usb/media/Kconfig	2005-06-30 11:21:49.000000000 +0200
+++ rc1-b/drivers/usb/media/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -2,11 +2,9 @@
 # USB Multimedia device configuration
 #
 comment "USB Multimedia devices"
-	depends on USB
 
 config USB_DABUSB
 	tristate "DABUSB driver"
-	depends on USB
 	---help---
 	  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
 	  brought to you by the DAB-Team
@@ -19,11 +17,11 @@ config USB_DABUSB
 	  module will be called dabusb.
 
 comment "Video4Linux support is needed for USB Multimedia device support"
-	depends on USB && VIDEO_DEV=n
+	depends on VIDEO_DEV=n
 
 config USB_VICAM
 	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-	depends on USB && VIDEO_DEV && EXPERIMENTAL
+	depends on VIDEO_DEV && EXPERIMENTAL
 	---help---
 	  Say Y here if you have 3com homeconnect camera (vicam).
 
@@ -37,7 +35,7 @@ config USB_VICAM
 
 config USB_DSBR
 	tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-	depends on USB && VIDEO_DEV && EXPERIMENTAL
+	depends on VIDEO_DEV && EXPERIMENTAL
 	---help---
 	  Say Y here if you want to connect this type of radio to your
 	  computer's USB port. Note that the audio is not digital, and
@@ -55,7 +53,7 @@ config USB_DSBR
 
 config USB_IBMCAM
 	tristate "USB IBM (Xirlink) C-it Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect a IBM "C-It" camera, also known as
 	  "Xirlink PC Camera" to your computer's USB port.  For more
@@ -76,7 +74,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
 	tristate "USB Konica Webcam support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want support for webcams based on a Konica
 	  chipset. This is known to work with the Intel YC76 webcam.
@@ -92,7 +90,7 @@ config USB_KONICAWC
 
 config USB_OV511
 	tristate "USB OV511 Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. See <file:Documentation/usb/ov511.txt> for more
@@ -108,7 +106,7 @@ config USB_OV511
 
 config USB_SE401
 	tristate "USB SE401 Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. See <file:Documentation/usb/se401.txt> for more
@@ -124,7 +122,7 @@ config USB_SE401
 
 config USB_SN9C102
 	tristate "USB SN9C10x PC Camera Controller support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want support for cameras based on SONiX SN9C101,
 	  SN9C102 or SN9C103 PC Camera Controllers.
@@ -139,7 +137,7 @@ config USB_SN9C102
 
 config USB_STV680
 	tristate "USB STV680 (Pencam) Camera support"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port. This includes the Pencam line of cameras.
@@ -156,7 +154,7 @@ config USB_STV680
 
 config USB_W9968CF
 	tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-	depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
+	depends on VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
 	---help---
 	  Say Y here if you want support for cameras based on OV681 or
 	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
@@ -178,7 +176,7 @@ config USB_W9968CF
 
 config USB_PWC
 	tristate "USB Philips Cameras"
-	depends on USB && VIDEO_DEV
+	depends on VIDEO_DEV
 	---help---
 	  Say Y or M here if you want to use one of these Philips & OEM
           webcams:
--- rc1-a/drivers/usb/storage/Kconfig	2005-06-30 11:21:50.000000000 +0200
+++ rc1-b/drivers/usb/storage/Kconfig	2005-07-04 14:14:40.000000000 +0200
@@ -3,11 +3,9 @@
 #
 
 comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information"
-	depends on USB
 
 config USB_STORAGE
 	tristate "USB Mass Storage support"
-	depends on USB
 	select SCSI
 	---help---
 	  Say Y here if you want to connect USB mass storage devices to your
-- 
The complexity of a weapon is inversely proportional to the IQ of the
weapon's operator.

[PATCH][Update] Kconfig changes 1b: s/menu/menuconfig/

[Bodo Eggert]

Part 1b: The easy stuff.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

These are some missing changes from the first patch(es).
I don't know where they went missing.

This patch applies to .12 and .13-rc1.


--- x/fs/partitions/Kconfig	2005-07-04 13:50:38.000000000 +0200
+++ b/fs/partitions/Kconfig	2005-06-30 09:39:18.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # Partition configuration
 #
-config PARTITION_ADVANCED
+menuconfig PARTITION_ADVANCED
 	bool "Advanced partition selection"
 	help
 	  Say Y here if you would like to use hard disks under Linux which
--- x/sound/oss/Kconfig	2005-07-04 13:50:55.000000000 +0200
+++ b/sound/oss/Kconfig	2005-06-29 16:49:05.000000000 +0200
@@ -1084,7 +1084,7 @@ config SOUND_TVMIXER
 
 config SOUND_KAHLUA
 	tristate "XpressAudio Sound Blaster emulation"
-	depends on SOUND_SB
+	depends on SOUND_SB && SOUND_PRIME
 
 config SOUND_ALI5455
 	tristate "ALi5455 audio support"
--- x/sound/oss/dmasound/Kconfig	2005-07-04 13:47:08.000000000 +0200
+++ b/sound/oss/dmasound/Kconfig	2005-06-29 16:45:48.000000000 +0200
@@ -56,3 +56,4 @@ config DMASOUND_Q40
 
 config DMASOUND
 	tristate
+	depends on SOUND
-- 
Top 100 things you don't want the sysadmin to say:
64. Do you really need your home directory to do any work?

Re: [PATCH] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

On Mon, 4 Jul 2005, Sam Ravnborg wrote:
> On Thu, Jun 30, 2005 at 11:06:01PM +0200, Bodo Eggert wrote:
> > Part 1: The easy stuff.

> > In many config submenus, the first menu option will enable the rest 
> > of the menu options. For these menus, It's appropriate to use the more 
> > convenient "menuconfig" keyword.
> 
> Please do not touch net/Kconfig and friends. I am preparing an
> update of this part so it will conflict.

What about drivers/net/*?
-- 
The complexity of a weapon is inversely proportional to the IQ of the
weapon's operator.

Re: [PATCH] Kconfig changes 4: s/menu/menuconfig/ CPU scaling menu

[Bodo Eggert]

Part 4b: The CPU scaling menu.

In many config submenus, the first menu option will enable the rest 
of the menu options. For these menus, It's appropriate to use the more 
convenient "menuconfig" keyword.

This patch applies to 2.6.12 and 2.6.13-rc1

--- x/drivers/cpufreq/Kconfig	2005-07-04 13:50:17.000000000 +0200
+++ b/drivers/cpufreq/Kconfig	2005-07-04 12:25:21.000000000 +0200
@@ -1,4 +1,4 @@
-config CPU_FREQ
+menuconfig CPU_FREQ
 	bool "CPU Frequency scaling"
 	help
 	  CPU Frequency scaling allows you to change the clock speed of 

-- 
Top 100 things you don't want the sysadmin to say:
5. Just add yourself to the password file and make a directory...

[PATCH][Update 2] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

> Part 1: The easy stuff.
> 
> In many config submenus, the first menu option will enable the rest 
> of the menu options. For these menus, It's appropriate to use the more 
> convenient "menuconfig" keyword.
> 
> I hope I got it right, especially the conversions to "if SYMBOL" and 
> merging the "depends on"s. It looks right, but please check that.
> 
> This patch is designed for 2.6.12; the patch for .13-rc1 will be posted
> tomorrow as a reply, unless there are major objections to this patch.

This is the same patch without the changes in /net, as requested by Sam 
Ravnborg. It does include the first update.

--- a/drivers/md/Kconfig	2005-06-19 14:16:41.000000000 +0200
+++ b/drivers/md/Kconfig	2005-06-29 13:23:07.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
 	help
@@ -236,5 +234,2 @@ config DM_MULTIPATH_EMC
 	---help---
 	  Multipath support for EMC CX/AX series hardware.
-
-endmenu
-
--- a/drivers/w1/Kconfig	2005-05-02 02:25:01.000000000 +0200
+++ b/drivers/w1/Kconfig	2005-06-29 13:25:37.000000000 +0200
@@ -1,6 +1,4 @@
-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's 1-wire bus is usefull to connect slow 1-pin devices 
@@ -54,4 +52,2 @@ config W1_SMEM
 	  Say Y here if you want to connect 1-wire 
 	  simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-endmenu
--- a/drivers/i2c/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/drivers/i2c/Kconfig	2005-06-29 13:32:15.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
@@ -73,5 +71,2 @@ config I2C_DEBUG_CHIP
 	  a problem with I2C support and want to see more of what is going
 	  on.
-
-endmenu
-
--- a/drivers/fc4/Kconfig	2004-08-14 07:36:56.000000000 +0200
+++ b/drivers/fc4/Kconfig	2005-06-29 13:33:48.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Fibre Channel support"
-
-config FC4
+menuconfig FC4
 	tristate "Fibre Channel and FC4 SCSI support"
 	---help---
@@ -77,5 +75,2 @@ config SCSI_FCAL
 	prompt "Generic FC-AL disk driver"
 	depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
-
-endmenu
-
--- a/drivers/ide/Kconfig	2005-06-19 14:16:37.000000000 +0200
+++ b/drivers/ide/Kconfig	2005-06-29 13:40:15.000000000 +0200
@@ -5,7 +5,5 @@
 #
 
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
 	---help---
@@ -1053,4 +1051,2 @@ config BLK_DEV_HD
 
 endif
-
-endmenu
--- a/drivers/mmc/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/mmc/Kconfig	2005-06-29 13:41:02.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "MMC/SD Card support"
-
-config MMC
-	tristate "MMC support"
+menuconfig MMC
+	tristate "MMC/SD Card support"
 	help
 	  MMC is the "multi-media card" bus protocol.
@@ -60,4 +58,2 @@ config MMC_WBSD
 
 	  If unsure, say N.
-
-endmenu
--- a/drivers/net/wan/Kconfig	2005-06-19 14:16:52.000000000 +0200
+++ b/drivers/net/wan/Kconfig	2005-06-29 13:49:27.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wan interfaces"
-	depends on NETDEVICES
-
-config WAN
+menuconfig WAN
 	bool "Wan interfaces support"
+	depends on NETDEVICES
 	---help---
 	  Wide Area Networks (WANs), such as X.25, Frame Relay and leased
@@ -603,5 +601,2 @@ config SBNI_MULTILINE
 
 	  If unsure, say N.
-
-endmenu
-
--- a/drivers/net/irda/Kconfig	2005-06-19 14:16:48.000000000 +0200
+++ b/drivers/net/irda/Kconfig	2005-06-30 10:13:49.000000000 +0200
@@ -1,6 +1,9 @@
 
-menu "Infrared-port device drivers"
+menuconfig IRDA_DEVICES
+	bool "Infrared-port device drivers"
 	depends on IRDA!=n
 
+if IRDA_DEVICES
+
 comment "SIR device drivers"
 
@@ -401,4 +404,3 @@ config VIA_FIR
 	  via-ircc.
 
-endmenu
-
+endif
--- a/drivers/net/tulip/Kconfig	2005-05-02 02:24:03.000000000 +0200
+++ b/drivers/net/tulip/Kconfig	2005-06-29 14:09:18.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Tulip family network device support"
-	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
-
-config NET_TULIP
+menuconfig NET_TULIP
 	bool "\"Tulip\" family network device support"
+	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
 	help
 	  This selects the "Tulip" family of EISA/PCI network cards.
@@ -162,5 +160,2 @@ config PCMCIA_XIRTULIP
 	  <file:Documentation/networking/net-modules.txt>.  The module will
 	  be called xircom_tulip_cb.  If unsure, say N.
-
-endmenu
-
--- a/drivers/net/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/net/Kconfig	2005-06-30 09:07:31.000000000 +0200
@@ -136,8 +136,6 @@ endif
 #
 
-menu "Ethernet (10 or 100Mbit)"
+menuconfig NET_ETHERNET
 	depends on NETDEVICES && !UML
-
-config NET_ETHERNET
 	bool "Ethernet (10 or 100Mbit)"
 	---help---
@@ -165,4 +163,6 @@ config NET_ETHERNET
 	  the questions about Ethernet network cards. If unsure, say N.
 
+if NET_ETHERNET
+
 config MII
 	tristate "Generic Media Independent Interface device support"
@@ -1763,5 +1763,5 @@ config NE_H8300
 source "drivers/net/fec_8xx/Kconfig"
 
-endmenu
+endif
 
 #
@@ -1769,7 +1769,10 @@ endmenu
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NET_ETHERNET1000
+	bool "Ethernet (1 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET1000
+
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2082,5 +2085,5 @@ config MV643XX_ETH_2
 	  Ethernet.
 
-endmenu
+endif
 
 #
@@ -2088,7 +2091,10 @@ endmenu
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NET_ETHERNET10_000
+	bool "Ethernet (10 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET10_000
+
 config IXGB
 	tristate "Intel(R) PRO/10GbE support"
@@ -2166,5 +2172,5 @@ config 2BUFF_MODE
 	If not sure please say N.
 
-endmenu
+endif
 
 if !UML
--- a/drivers/net/arcnet/Kconfig	2005-05-02 02:25:46.000000000 +0200
+++ b/drivers/net/arcnet/Kconfig	2005-06-29 13:48:05.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "ARCnet devices"
+menuconfig ARCNET
+	tristate "ARCnet device support"
 	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
@@ -136,5 +134,2 @@ config ARCNET_COM20020_PCI
 	tristate "Support for COM20020 on PCI"
 	depends on ARCNET_COM20020 && PCI
-
-endmenu
-
--- a/drivers/net/tokenring/Kconfig	2005-05-02 02:25:48.000000000 +0200
+++ b/drivers/net/tokenring/Kconfig	2005-06-29 14:13:55.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "Token Ring devices"
+menuconfig TR
 	depends on NETDEVICES
-
-# So far, we only have PCI, ISA, and MCA token ring devices
-config TR
 	bool "Token Ring driver support"
+# So far, we only have PCI, ISA, and MCA token ring devices
 	depends on (PCI || ISA || MCA || CCW)
 	select LLC
@@ -182,5 +180,2 @@ config SMCTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called smctr.
-
-endmenu
-
--- a/drivers/net/pcmcia/Kconfig	2005-05-02 02:25:47.000000000 +0200
+++ b/drivers/net/pcmcia/Kconfig	2005-06-29 14:21:56.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "PCMCIA network device support"
-	depends on NETDEVICES && PCMCIA!=n
-
-config NET_PCMCIA
+menuconfig NET_PCMCIA
 	bool "PCMCIA network device support"
+	depends on NETDEVICES && PCMCIA!=n
 	---help---
 	  Say Y if you would like to include support for any PCMCIA or CardBus
@@ -128,5 +126,2 @@ config PCMCIA_IBMTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called ibmtr_cs.
-
-endmenu
-
--- a/drivers/net/wireless/Kconfig	2005-06-19 14:16:52.000000000 +0200
+++ b/drivers/net/wireless/Kconfig	2005-06-29 14:25:06.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wireless LAN (non-hamradio)"
-	depends on NETDEVICES
-
-config NET_RADIO
+menuconfig NET_RADIO
 	bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+	depends on NETDEVICES
 	---help---
 	  Support for wireless LANs and everything having to do with radio,
@@ -361,5 +359,2 @@ config NET_WIRELESS
 	depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 	default y
-
-endmenu
-
--- a/drivers/mtd/nand/Kconfig	2005-05-02 02:25:46.000000000 +0200
+++ b/drivers/mtd/nand/Kconfig	2005-06-29 14:45:32.000000000 +0200
@@ -2,9 +2,10 @@
 # $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
 
-menu "NAND Flash Device Drivers"
-	depends on MTD!=n
+config MTD_NAND_IDS
+	depends on MTD
+	tristate
 
-config MTD_NAND
-	tristate "NAND Device Support"
+menuconfig MTD_NAND
+	tristate "NAND Flash Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
@@ -56,7 +57,4 @@ config MTD_NAND_TOTO
 	  Support for NAND flash on Texas Instruments Toto platform.
 
-config MTD_NAND_IDS
-	tristate
-
 config MTD_NAND_TX4925NDFMC
 	tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
@@ -204,4 +202,2 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
 	  The simulator may simulate verious NAND flash chips for the
 	  MTD nand layer.
- 
-endmenu
--- a/drivers/mtd/Kconfig	2005-06-19 14:16:46.000000000 +0200
+++ b/drivers/mtd/Kconfig	2005-06-29 14:30:26.000000000 +0200
@@ -1,7 +1,5 @@
 # $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $
 
-menu "Memory Technology Devices (MTD)"
-
-config MTD
+menuconfig MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
@@ -261,5 +259,2 @@ source "drivers/mtd/devices/Kconfig"
 
 source "drivers/mtd/nand/Kconfig"
-
-endmenu
-
--- a/drivers/pci/hotplug/Kconfig	2005-05-02 02:25:49.000000000 +0200
+++ b/drivers/pci/hotplug/Kconfig	2005-06-29 14:49:25.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL
@@ -193,5 +191,2 @@ config HOTPLUG_PCI_SGI
 
 	  When in doubt, say N.
-
-endmenu
-
--- a/drivers/pnp/Kconfig	2005-05-02 02:24:56.000000000 +0200
+++ b/drivers/pnp/Kconfig	2005-06-29 14:51:49.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Plug and Play support"
-
-config PNP
+menuconfig PNP
 	bool "Plug and Play support"
 	depends on ISA || ACPI_BUS
@@ -37,5 +35,2 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
-
-endmenu
-
--- a/drivers/usb/serial/Kconfig	2005-06-19 14:17:06.000000000 +0200
+++ b/drivers/usb/serial/Kconfig	2005-06-29 15:05:18.000000000 +0200
@@ -3,8 +3,5 @@
 #
 
-menu "USB Serial Converter support"
-	depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
 	depends on USB
@@ -481,4 +478,2 @@ config USB_EZUSB
 	default y
 
-endmenu
-
--- a/drivers/acpi/Kconfig	2005-06-19 14:16:26.000000000 +0200
+++ b/drivers/acpi/Kconfig	2005-06-29 15:08:06.000000000 +0200
@@ -3,13 +3,10 @@
 #
 
-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+	bool "ACPI (Advanced Configuration and Power Interface) Support"
 	depends on !X86_VISWS
 	depends on !IA64_HP_SIM
 	depends on IA64 || X86
 
-config ACPI
-	bool "ACPI Support"
-	depends on IA64 || X86
-
 	default y
 	---help---
@@ -352,4 +349,2 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
-
-endmenu
--- a/drivers/char/tpm/Kconfig	2005-06-19 14:16:33.000000000 +0200
+++ b/drivers/char/tpm/Kconfig	2005-06-29 15:10:22.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "TPM devices"
-
-config TCG_TPM
+menuconfig TCG_TPM
 	tristate "TPM Hardware Support"
 	depends on EXPERIMENTAL && PCI
@@ -35,5 +33,2 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver 
 	  as a module, choose M here; the module will be called tpm_atmel.
-
-endmenu
-
--- a/drivers/char/ipmi/Kconfig	2005-05-02 02:25:43.000000000 +0200
+++ b/drivers/char/ipmi/Kconfig	2005-06-29 15:11:42.000000000 +0200
@@ -3,6 +3,5 @@
 #
 
-menu "IPMI"
-config IPMI_HANDLER
+menuconfig IPMI_HANDLER
        tristate 'IPMI top-level message handler'
        help
@@ -64,4 +63,2 @@ config IPMI_POWEROFF
          This enables a function to power off the system with IPMI if
 	 the IPMI management controller is capable of this.
-
-endmenu
--- a/drivers/char/watchdog/Kconfig	2005-06-19 14:16:33.000000000 +0200
+++ b/drivers/char/watchdog/Kconfig	2005-06-29 15:14:36.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG
 	bool "Watchdog Timer Support"
 	---help---
@@ -546,4 +544,2 @@ config USBPCWATCHDOG
 
 	  Most people will say N.
-
-endmenu
--- a/drivers/isdn/hisax/Kconfig	2005-06-19 14:16:40.000000000 +0200
+++ b/drivers/isdn/hisax/Kconfig	2005-06-29 15:24:55.000000000 +0200
@@ -1,8 +1,6 @@
 
-menu "Passive cards"
+menuconfig ISDN_DRV_HISAX
+	tristate "Passive cards (HiSax, HFC)"
 	depends on ISDN_I4L
-
-config ISDN_DRV_HISAX
-	tristate "HiSax SiemensChipSet driver support"
 	select CRC_CCITT
 	---help---
@@ -438,5 +436,2 @@ config HISAX_AVM_A1_PCMCIA
 
 endif
-
-endmenu
-
--- a/drivers/isdn/Kconfig	2004-08-14 07:38:04.000000000 +0200
+++ b/drivers/isdn/Kconfig	2005-06-29 15:26:04.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "ISDN subsystem"
-
-config ISDN
-	tristate "ISDN support"
+menuconfig ISDN
+	tristate "ISDN subsystem"
 	depends on NET
 	---help---
@@ -63,5 +61,2 @@ source "drivers/isdn/capi/Kconfig"
 
 source "drivers/isdn/hardware/Kconfig"
-
-endmenu
-
--- a/drivers/isdn/hardware/avm/Kconfig	2005-05-02 02:24:52.000000000 +0200
+++ b/drivers/isdn/hardware/avm/Kconfig	2005-06-29 15:29:00.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active AVM cards"
+menuconfig CAPI_AVM
+	bool "Active AVM cards"
 	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_AVM
-	bool "Support AVM cards"
 	help
 	  Enable support for AVM active ISDN cards.
@@ -62,5 +60,2 @@ config ISDN_DRV_AVMB1_C4
 	  Enable support for the AVM C4/C2 PCI cards.
 	  These cards handle 4/2 BRI ISDN lines (8/4 channels).
-
-endmenu
-
--- a/drivers/isdn/hardware/eicon/Kconfig	2004-08-14 07:36:59.000000000 +0200
+++ b/drivers/isdn/hardware/eicon/Kconfig	2005-06-29 15:29:27.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active Eicon DIVA Server cards"
-	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_EICON
+menuconfig CAPI_EICON
 	bool "Support Eicon cards"
+	depends on NET && ISDN && ISDN_CAPI!=n
 	help
 	  Enable support for Eicon Networks active ISDN cards.
@@ -49,5 +47,2 @@ config ISDN_DIVAS_MAINT
 	help
 	  Enable Divas Maintainance driver.
-
-endmenu
-
--- a/drivers/scsi/Kconfig	2005-06-19 14:16:58.000000000 +0200
+++ b/drivers/scsi/Kconfig	2005-06-29 15:30:59.000000000 +0200
@@ -1,5 +1,3 @@
-menu "SCSI device support"
-
-config SCSI
+menuconfig SCSI
 	tristate "SCSI device support"
 	---help---
@@ -1797,4 +1795,2 @@ endmenu
 
 source "drivers/scsi/pcmcia/Kconfig"
-
-endmenu
--- a/drivers/scsi/pcmcia/Kconfig	2004-08-14 07:37:25.000000000 +0200
+++ b/drivers/scsi/pcmcia/Kconfig	2005-06-29 15:33:03.000000000 +0200
@@ -3,7 +3,10 @@
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n && MODULES
 
+if SCSI_PCMCIA
+
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
@@ -80,3 +83,3 @@ config PCMCIA_SYM53C500
 	  module will be called sym53c500_cs.
 
-endmenu
+endif
--- a/drivers/infiniband/Kconfig	2005-05-02 02:25:44.000000000 +0200
+++ b/drivers/infiniband/Kconfig	2005-06-29 15:35:18.000000000 +0200
@@ -1,5 +1,3 @@
-menu "InfiniBand support"
-
-config INFINIBAND
+menuconfig INFINIBAND
 	tristate "InfiniBand support"
 	---help---
@@ -11,4 +9,2 @@ source "drivers/infiniband/hw/mthca/Kcon
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
-
-endmenu
--- a/drivers/cdrom/Kconfig	2005-06-19 14:16:31.000000000 +0200
+++ b/drivers/cdrom/Kconfig	2005-06-29 11:27:02.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Old CD-ROM drivers (not SCSI, not IDE)"
+menuconfig CD_NO_IDESCSI
+	bool "Old CD-ROM drivers (not SCSI, IDE or ATAPI)"
 	depends on ISA
-
-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
@@ -210,4 +208,2 @@ config CDU535
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonycd535.
-
-endmenu
--- a/drivers/media/dvb/Kconfig	2005-06-19 14:16:41.000000000 +0200
+++ b/drivers/media/dvb/Kconfig	2005-06-29 15:50:58.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Digital Video Broadcasting Devices"
-
-config DVB
-	bool "DVB For Linux"
+menuconfig DVB
+	bool "Digital Video Broadcasting Devices"
 	depends on NET && INET
 	---help---
@@ -44,4 +42,2 @@ comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
-
-endmenu
--- a/drivers/video/logo/Kconfig	2005-06-19 14:17:08.000000000 +0200
+++ b/drivers/video/logo/Kconfig	2005-06-29 15:59:13.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Logo configuration"
-
-config LOGO
-	bool "Bootup logo"
+menuconfig LOGO
+	bool "Bootup logo configuration"
 	depends on FB || SGI_NEWPORT_CONSOLE
 
@@ -63,5 +61,2 @@ config LOGO_SUPERH_CLUT224
 	depends on LOGO && SUPERH
 	default y
-
-endmenu
-
--- a/drivers/message/i2o/Kconfig	2004-08-14 07:36:13.000000000 +0200
+++ b/drivers/message/i2o/Kconfig	2005-06-29 16:05:13.000000000 +0200
@@ -1,6 +1,3 @@
-
-menu "I2O device support"
-
-config I2O
+menuconfig I2O
 	tristate "I2O support"
 	depends on PCI
@@ -71,5 +68,2 @@ config I2O_PROC
 	  To compile this support as a module, choose M here: the
 	  module will be called i2o_proc.
-
-endmenu
-
--- a/drivers/message/fusion/Kconfig	2005-05-02 02:24:54.000000000 +0200
+++ b/drivers/message/fusion/Kconfig	2005-06-29 16:07:51.000000000 +0200
@@ -1,7 +1,4 @@
-
-menu "Fusion MPT device support"
-
-config FUSION
-	tristate "Fusion MPT (base + ScsiHost) drivers"
+menuconfig FUSION
+	tristate "Fusion MPT support (base + ScsiHost)"
 	depends on PCI && SCSI
 	---help---
@@ -63,4 +60,2 @@ config FUSION_LAN
 
 	  If unsure whether you really want or need this, say N.
-
-endmenu
--- a/drivers/ieee1394/Kconfig	2005-06-19 14:16:37.000000000 +0200
+++ b/drivers/ieee1394/Kconfig	2005-06-29 16:10:10.000000000 +0200
@@ -1,7 +1,5 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support"
-
-config IEEE1394
+menuconfig IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
 	depends on PCI || BROKEN
@@ -180,4 +178,2 @@ config IEEE1394_AMDTP
 	  To compile this driver as a module, say M here: the
 	  module will be called amdtp.
-
-endmenu
--- a/drivers/pcmcia/Kconfig	2005-06-19 14:16:54.000000000 +0200
+++ b/drivers/pcmcia/Kconfig	2005-06-29 16:12:49.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
 	tristate "PCCard (PCMCIA/CardBus) support"
 	select HOTPLUG
@@ -200,4 +198,2 @@ config PCCARD_NONSTATIC
 
 endif	# PCCARD
-
-endmenu
--- a/drivers/telephony/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ b/drivers/telephony/Kconfig	2005-06-29 16:31:22.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Telephony Support"
-
-config PHONE
-	tristate "Linux telephony support"
+menuconfig PHONE
+	tristate "Telephony support"
 	---help---
 	  Say Y here if you have a telephony card, which for example allows
@@ -43,5 +41,2 @@ config PHONE_IXJ_PCMCIA
 	  cards manufactured by Quicknet Technologies, Inc.  This changes the
 	  card initialization code to work with the card manager daemon.
-
-endmenu
-
--- a/drivers/parport/Kconfig	2005-06-19 14:16:53.000000000 +0200
+++ b/drivers/parport/Kconfig	2005-06-29 16:33:53.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
 	tristate "Parallel port support"
 	---help---
@@ -84,4 +82,5 @@ config PARPORT_PC_PCMCIA
 
 config PARPORT_NOT_PC
+	depends on PARPORT
 	bool
 
@@ -141,5 +140,2 @@ config PARPORT_1284
 	  transfer modes. Also say Y if you want device ID information to
 	  appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
-
-endmenu
-
--- a/fs/nls/Kconfig	2004-08-14 07:36:10.000000000 +0200
+++ b/fs/nls/Kconfig	2005-06-30 08:37:19.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Native Language Support"
-
-config NLS
-	tristate "Base native language support"
+menuconfig NLS
+	tristate "Native language support"
 	---help---
 	  The base Native Language Support. A number of filesystems
@@ -501,4 +499,2 @@ config NLS_UTF8
 	  the Unicode/ISO9646 universal character set.
 
-endmenu
-
--- a/fs/xfs/Kconfig	2005-05-02 02:25:53.000000000 +0200
+++ b/fs/xfs/Kconfig	2005-06-30 08:41:21.000000000 +0200
@@ -1,6 +1,4 @@
-menu "XFS support"
-
-config XFS_FS
-	tristate "XFS filesystem support"
+menuconfig XFS_FS
+	tristate "XFS support"
 	select EXPORTFS if NFSD!=n
 	help
@@ -21,11 +19,13 @@ config XFS_FS
 	  to use an initial ramdisk (initrd) to boot.
 
+if XFS_FS
+
 config XFS_EXPORT
 	bool
-	default y if XFS_FS && EXPORTFS
+	default y if EXPORTFS
 
 config XFS_RT
 	bool "Realtime support (EXPERIMENTAL)"
-	depends on XFS_FS && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here you will be able to mount and use XFS filesystems
@@ -44,5 +44,4 @@ config XFS_RT
 config XFS_QUOTA
 	bool "Quota support"
-	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
@@ -61,5 +60,4 @@ config XFS_QUOTA
 config XFS_SECURITY
 	bool "Security Label support"
-	depends on XFS_FS
 	help
 	  Security labels support alternative access control models
@@ -73,5 +71,4 @@ config XFS_SECURITY
 config XFS_POSIX_ACL
 	bool "POSIX ACL support"
-	depends on XFS_FS
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -83,3 +80,3 @@ config XFS_POSIX_ACL
 	  If you don't know what Access Control Lists are, say N.
 
-endmenu
+endif
--- a/fs/Kconfig	2005-06-19 14:17:10.000000000 +0200
+++ b/fs/Kconfig	2005-06-30 09:40:19.000000000 +0200
@@ -1718,10 +1718,6 @@ config RXRPC
 endmenu
 
-menu "Partition Types"
-
 source "fs/partitions/Kconfig"
 
-endmenu
-
 source "fs/nls/Kconfig"
 
--- a/init/Kconfig	2005-06-19 14:17:44.000000000 +0200
+++ b/init/Kconfig	2005-06-30 09:17:08.000000000 +0200
@@ -391,8 +391,6 @@ config BASE_SMALL
 	default 1 if !BASE_FULL
 
-menu "Loadable module support"
-
-config MODULES
-	bool "Enable loadable module support"
+menuconfig MODULES
+	bool "Loadable module support"
 	help
 	  Kernel modules are small pieces of compiled code which can
@@ -413,7 +411,8 @@ config MODULES
 	  If unsure, say Y.
 
+if MODULES
+
 config MODULE_UNLOAD
 	bool "Module unloading"
-	depends on MODULES
 	help
 	  Without this option you will not be able to unload any
@@ -435,5 +434,4 @@ config OBSOLETE_MODPARM
 	bool
 	default y
-	depends on MODULES
 	help
 	  You need this option to use module parameters on modules which
@@ -443,5 +441,5 @@ config OBSOLETE_MODPARM
 config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
-	depends on MODULES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Usually, you have to use modules compiled with your kernel.
@@ -454,5 +452,4 @@ config MODVERSIONS
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
@@ -466,5 +463,4 @@ config MODULE_SRCVERSION_ALL
 config KMOD
 	bool "Automatic kernel module loading"
-	depends on MODULES
 	help
 	  Normally when you have selected some parts of the kernel to
@@ -482,3 +478,4 @@ config STOP_MACHINE
 	help
 	  Need stop_machine() primitive.
-endmenu
+
+endif
--- a/sound/Kconfig	2005-05-02 02:26:19.000000000 +0200
+++ b/sound/Kconfig	2005-06-29 16:50:57.000000000 +0200
@@ -2,7 +2,5 @@
 #
 
-menu "Sound"
-
-config SOUND
+menuconfig SOUND
 	tristate "Sound card support"
 	help
@@ -33,12 +31,11 @@ config SOUND
 	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
 
+if SOUND
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 
-menu "Advanced Linux Sound Architecture"
-	depends on SOUND!=n
-
-config SND
+menuconfig SND
 	tristate "Advanced Linux Sound Architecture"
 	depends on SOUND
@@ -70,12 +67,7 @@ source "sound/sparc/Kconfig"
 source "sound/parisc/Kconfig"
 
-endmenu
-
-menu "Open Sound System"
-	depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
-
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
+	depends on SOUND && (BROKEN || (!SPARC32 && !SPARC64))
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
@@ -83,7 +75,5 @@ config SOUND_PRIME
 source "sound/oss/Kconfig"
 
-endmenu
-
 endif
 
-endmenu
+endif
--- x/fs/partitions/Kconfig	2005-07-04 13:50:38.000000000 +0200
+++ b/fs/partitions/Kconfig	2005-06-30 09:39:18.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # Partition configuration
 #
-config PARTITION_ADVANCED
+menuconfig PARTITION_ADVANCED
 	bool "Advanced partition selection"
 	help
 	  Say Y here if you would like to use hard disks under Linux which
--- x/sound/oss/Kconfig	2005-07-04 13:50:55.000000000 +0200
+++ b/sound/oss/Kconfig	2005-06-29 16:49:05.000000000 +0200
@@ -1084,7 +1084,7 @@ config SOUND_TVMIXER
 
 config SOUND_KAHLUA
 	tristate "XpressAudio Sound Blaster emulation"
-	depends on SOUND_SB
+	depends on SOUND_SB && SOUND_PRIME
 
 config SOUND_ALI5455
 	tristate "ALi5455 audio support"
--- x/sound/oss/dmasound/Kconfig	2005-07-04 13:47:08.000000000 +0200
+++ b/sound/oss/dmasound/Kconfig	2005-06-29 16:45:48.000000000 +0200
@@ -56,3 +56,4 @@ config DMASOUND_Q40
 
 config DMASOUND
 	tristate
+	depends on SOUND
-- 
The perfect officer for the job will transfer in the day after that billet
is filled by someone else.

[PATCH][Update 2] Kconfig changes: s/menu/menuconfig/

[Bodo Eggert]

On Fri, 1 Jul 2005, Bodo Eggert wrote:

> Part 1b: The easy stuff for 2.6.13-rc1.

This is the same patch without the changes in /net, as requested by Sam
Ravnborg. It does include the first update.

--- rc1-a/drivers/md/Kconfig	2005-06-30 11:21:40.000000000 +0200
+++ rc1-b/drivers/md/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Multi-device support (RAID and LVM)"
-
-config MD
+menuconfig MD
 	bool "Multiple devices driver support (RAID and LVM)"
 	help
@@ -236,5 +234,2 @@ config DM_MULTIPATH_EMC
 	---help---
 	  Multipath support for EMC CX/AX series hardware.
-
-endmenu
-
--- rc1-a/drivers/w1/Kconfig	2005-06-30 11:22:41.000000000 +0200
+++ rc1-b/drivers/w1/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,4 @@
-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's 1-wire bus is usefull to connect slow 1-pin devices
@@ -54,4 +52,2 @@ config W1_SMEM
 	  Say Y here if you want to connect 1-wire
 	  simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-endmenu
--- rc1-a/drivers/i2c/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ rc1-b/drivers/i2c/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "I2C support"
-
-config I2C
+menuconfig I2C
 	tristate "I2C support"
 	---help---
@@ -73,5 +71,2 @@ config I2C_DEBUG_CHIP
 	  a problem with I2C support and want to see more of what is going
 	  on.
-
-endmenu
-
--- rc1-a/drivers/fc4/Kconfig	2004-08-14 07:36:56.000000000 +0200
+++ rc1-b/drivers/fc4/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Fibre Channel support"
-
-config FC4
+menuconfig FC4
 	tristate "Fibre Channel and FC4 SCSI support"
 	---help---
@@ -77,5 +75,2 @@ config SCSI_FCAL
 	prompt "Generic FC-AL disk driver"
 	depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
-
-endmenu
-
--- rc1-a/drivers/ide/Kconfig	2005-06-30 11:22:23.000000000 +0200
+++ rc1-b/drivers/ide/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -5,7 +5,5 @@
 #
 
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
 	tristate "ATA/ATAPI/MFM/RLL support"
 	---help---
@@ -1059,4 +1057,2 @@ config BLK_DEV_HD
 
 endif
-
-endmenu
--- rc1-a/drivers/mmc/Kconfig	2005-06-30 11:21:42.000000000 +0200
+++ rc1-b/drivers/mmc/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "MMC/SD Card support"
-
-config MMC
-	tristate "MMC support"
+menuconfig MMC
+	tristate "MMC/SD Card support"
 	help
 	  MMC is the "multi-media card" bus protocol.
@@ -60,4 +58,2 @@ config MMC_WBSD
 
 	  If unsure, say N.
-
-endmenu
--- rc1-a/drivers/net/wan/Kconfig	2005-06-30 11:22:37.000000000 +0200
+++ rc1-b/drivers/net/wan/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wan interfaces"
-	depends on NETDEVICES
-
-config WAN
+menuconfig WAN
 	bool "Wan interfaces support"
+	depends on NETDEVICES
 	---help---
 	  Wide Area Networks (WANs), such as X.25, Frame Relay and leased
@@ -603,5 +601,2 @@ config SBNI_MULTILINE
 
 	  If unsure, say N.
-
-endmenu
-
--- rc1-a/drivers/net/irda/Kconfig	2005-06-30 11:21:44.000000000 +0200
+++ rc1-b/drivers/net/irda/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,9 @@
 
-menu "Infrared-port device drivers"
+menuconfig IRDA_DEVICES
+	bool "Infrared-port device drivers"
 	depends on IRDA!=n
 
+if IRDA_DEVICES
+
 comment "SIR device drivers"
 
@@ -401,4 +404,3 @@ config VIA_FIR
 	  via-ircc.
 
-endmenu
-
+endif
--- rc1-a/drivers/net/tulip/Kconfig	2005-06-30 11:18:11.000000000 +0200
+++ rc1-b/drivers/net/tulip/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Tulip family network device support"
-	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
-
-config NET_TULIP
+menuconfig NET_TULIP
 	bool "\"Tulip\" family network device support"
+	depends on NET_ETHERNET && (PCI || EISA || CARDBUS)
 	help
 	  This selects the "Tulip" family of EISA/PCI network cards.
@@ -162,5 +160,2 @@ config PCMCIA_XIRTULIP
 	  <file:Documentation/networking/net-modules.txt>.  The module will
 	  be called xircom_tulip_cb.  If unsure, say N.
-
-endmenu
-
--- rc1-a/drivers/net/Kconfig	2005-06-30 11:22:26.000000000 +0200
+++ rc1-b/drivers/net/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -136,8 +136,6 @@ endif
 #
 
-menu "Ethernet (10 or 100Mbit)"
+menuconfig NET_ETHERNET
 	depends on NETDEVICES && !UML
-
-config NET_ETHERNET
 	bool "Ethernet (10 or 100Mbit)"
 	---help---
@@ -165,4 +163,6 @@ config NET_ETHERNET
 	  the questions about Ethernet network cards. If unsure, say N.
 
+if NET_ETHERNET
+
 config MII
 	tristate "Generic Media Independent Interface device support"
@@ -1752,5 +1752,5 @@ config NE_H8300
 source "drivers/net/fec_8xx/Kconfig"
 
-endmenu
+endif
 
 #
@@ -1758,7 +1758,10 @@ endmenu
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NET_ETHERNET1000
+	bool "Ethernet (1 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET1000
+
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2083,5 +2086,5 @@ config MV643XX_ETH_2
 	  Ethernet.
 
-endmenu
+endif
 
 #
@@ -2089,7 +2092,10 @@ endmenu
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NET_ETHERNET10_000
+	bool "Ethernet (10 Gbit)"
 	depends on NETDEVICES && !UML
 
+if NET_ETHERNET10_000
+
 config IXGB
 	tristate "Intel(R) PRO/10GbE support"
@@ -2167,5 +2173,5 @@ config 2BUFF_MODE
 	If not sure please say N.
 
-endmenu
+endif
 
 if !UML
--- rc1-a/drivers/net/arcnet/Kconfig	2005-06-30 11:20:35.000000000 +0200
+++ rc1-b/drivers/net/arcnet/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "ARCnet devices"
+menuconfig ARCNET
+	tristate "ARCnet device support"
 	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
@@ -136,5 +134,2 @@ config ARCNET_COM20020_PCI
 	tristate "Support for COM20020 on PCI"
 	depends on ARCNET_COM20020 && PCI
-
-endmenu
-
--- rc1-a/drivers/net/tokenring/Kconfig	2005-06-30 11:20:36.000000000 +0200
+++ rc1-b/drivers/net/tokenring/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,10 +3,8 @@
 #
 
-menu "Token Ring devices"
+menuconfig TR
 	depends on NETDEVICES
-
-# So far, we only have PCI, ISA, and MCA token ring devices
-config TR
 	bool "Token Ring driver support"
+# So far, we only have PCI, ISA, and MCA token ring devices
 	depends on (PCI || ISA || MCA || CCW)
 	select LLC
@@ -182,5 +180,2 @@ config SMCTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called smctr.
-
-endmenu
-
--- rc1-a/drivers/net/pcmcia/Kconfig	2005-06-30 11:20:36.000000000 +0200
+++ rc1-b/drivers/net/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "PCMCIA network device support"
-	depends on NETDEVICES && PCMCIA!=n
-
-config NET_PCMCIA
+menuconfig NET_PCMCIA
 	bool "PCMCIA network device support"
+	depends on NETDEVICES && PCMCIA!=n
 	---help---
 	  Say Y if you would like to include support for any PCMCIA or CardBus
@@ -128,5 +126,2 @@ config PCMCIA_IBMTR
 	  To compile this driver as a module, choose M here: the module will be
 	  called ibmtr_cs.
-
-endmenu
-
--- rc1-a/drivers/net/wireless/Kconfig	2005-06-30 11:21:45.000000000 +0200
+++ rc1-b/drivers/net/wireless/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Wireless LAN (non-hamradio)"
-	depends on NETDEVICES
-
-config NET_RADIO
+menuconfig NET_RADIO
 	bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+	depends on NETDEVICES
 	---help---
 	  Support for wireless LANs and everything having to do with radio,
@@ -361,5 +359,2 @@ config NET_WIRELESS
 	depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 	default y
-
-endmenu
-
--- rc1-a/drivers/mtd/nand/Kconfig	2005-06-30 11:20:35.000000000 +0200
+++ rc1-b/drivers/mtd/nand/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -2,9 +2,10 @@
 # $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
 
-menu "NAND Flash Device Drivers"
-	depends on MTD!=n
+config MTD_NAND_IDS
+	depends on MTD
+	tristate
 
-config MTD_NAND
-	tristate "NAND Device Support"
+menuconfig MTD_NAND
+	tristate "NAND Flash Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
@@ -56,7 +57,4 @@ config MTD_NAND_TOTO
 	  Support for NAND flash on Texas Instruments Toto platform.
 
-config MTD_NAND_IDS
-	tristate
-
 config MTD_NAND_TX4925NDFMC
 	tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
@@ -204,4 +202,2 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
 	  The simulator may simulate verious NAND flash chips for the
 	  MTD nand layer.
- 
-endmenu
--- rc1-a/drivers/mtd/Kconfig	2005-06-30 11:21:42.000000000 +0200
+++ rc1-b/drivers/mtd/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,7 +1,5 @@
 # $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $
 
-menu "Memory Technology Devices (MTD)"
-
-config MTD
+menuconfig MTD
 	tristate "Memory Technology Device (MTD) support"
 	help
@@ -261,5 +259,2 @@ source "drivers/mtd/devices/Kconfig"
 
 source "drivers/mtd/nand/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/pci/hotplug/Kconfig	2005-06-30 11:20:37.000000000 +0200
+++ rc1-b/drivers/pci/hotplug/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "PCI Hotplug Support"
-
-config HOTPLUG_PCI
+menuconfig HOTPLUG_PCI
 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL
@@ -193,5 +191,2 @@ config HOTPLUG_PCI_SGI
 
 	  When in doubt, say N.
-
-endmenu
-
--- rc1-a/drivers/pnp/Kconfig	2005-06-30 11:19:30.000000000 +0200
+++ rc1-b/drivers/pnp/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Plug and Play support"
-
-config PNP
+menuconfig PNP
 	bool "Plug and Play support"
 	depends on ISA || ACPI_BUS
@@ -37,5 +35,2 @@ source "drivers/pnp/pnpbios/Kconfig"
 
 source "drivers/pnp/pnpacpi/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/usb/serial/Kconfig	2005-06-30 11:21:50.000000000 +0200
+++ rc1-b/drivers/usb/serial/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,5 @@
 #
 
-menu "USB Serial Converter support"
-	depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
 	tristate "USB Serial Converter support"
 	depends on USB
@@ -481,4 +478,2 @@ config USB_EZUSB
 	default y
 
-endmenu
-
--- rc1-a/drivers/acpi/Kconfig	2005-06-30 11:22:22.000000000 +0200
+++ rc1-b/drivers/acpi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,13 +3,10 @@
 #
 
-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+	bool "ACPI (Advanced Configuration and Power Interface) Support"
 	depends on !X86_VISWS
 	depends on !IA64_HP_SIM
 	depends on IA64 || X86
 
-config ACPI
-	bool "ACPI Support"
-	depends on IA64 || X86
-
 	default y
 	---help---
@@ -352,4 +349,2 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
-
-endmenu
--- rc1-a/drivers/char/tpm/Kconfig	2005-06-30 11:21:32.000000000 +0200
+++ rc1-b/drivers/char/tpm/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "TPM devices"
-
-config TCG_TPM
+menuconfig TCG_TPM
 	tristate "TPM Hardware Support"
 	depends on EXPERIMENTAL && PCI
@@ -35,5 +33,2 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver 
 	  as a module, choose M here; the module will be called tpm_atmel.
-
-endmenu
-
--- rc1-a/drivers/char/ipmi/Kconfig	2005-06-30 11:20:27.000000000 +0200
+++ rc1-b/drivers/char/ipmi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,6 +3,5 @@
 #
 
-menu "IPMI"
-config IPMI_HANDLER
+menuconfig IPMI_HANDLER
        tristate 'IPMI top-level message handler'
        help
@@ -64,4 +63,2 @@ config IPMI_POWEROFF
          This enables a function to power off the system with IPMI if
 	 the IPMI management controller is capable of this.
-
-endmenu
--- rc1-a/drivers/char/watchdog/Kconfig	2005-06-30 11:22:23.000000000 +0200
+++ rc1-b/drivers/char/watchdog/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,5 @@
 #
 
-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG
 	bool "Watchdog Timer Support"
 	---help---
@@ -556,4 +554,2 @@ config USBPCWATCHDOG
 
 	  Most people will say N.
-
-endmenu
--- rc1-a/drivers/isdn/hisax/Kconfig	2005-06-30 11:21:40.000000000 +0200
+++ rc1-b/drivers/isdn/hisax/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,8 +1,6 @@
 
-menu "Passive cards"
+menuconfig ISDN_DRV_HISAX
+	tristate "Passive cards (HiSax, HFC)"
 	depends on ISDN_I4L
-
-config ISDN_DRV_HISAX
-	tristate "HiSax SiemensChipSet driver support"
 	select CRC_CCITT
 	---help---
@@ -438,5 +436,2 @@ config HISAX_AVM_A1_PCMCIA
 
 endif
-
-endmenu
-
--- rc1-a/drivers/isdn/Kconfig	2004-08-14 07:38:04.000000000 +0200
+++ rc1-b/drivers/isdn/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "ISDN subsystem"
-
-config ISDN
-	tristate "ISDN support"
+menuconfig ISDN
+	tristate "ISDN subsystem"
 	depends on NET
 	---help---
@@ -63,5 +61,2 @@ source "drivers/isdn/capi/Kconfig"
 
 source "drivers/isdn/hardware/Kconfig"
-
-endmenu
-
--- rc1-a/drivers/isdn/hardware/avm/Kconfig	2005-06-30 11:19:17.000000000 +0200
+++ rc1-b/drivers/isdn/hardware/avm/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active AVM cards"
+menuconfig CAPI_AVM
+	bool "Active AVM cards"
 	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_AVM
-	bool "Support AVM cards"
 	help
 	  Enable support for AVM active ISDN cards.
@@ -62,5 +60,2 @@ config ISDN_DRV_AVMB1_C4
 	  Enable support for the AVM C4/C2 PCI cards.
 	  These cards handle 4/2 BRI ISDN lines (8/4 channels).
-
-endmenu
-
--- rc1-a/drivers/isdn/hardware/eicon/Kconfig	2004-08-14 07:36:59.000000000 +0200
+++ rc1-b/drivers/isdn/hardware/eicon/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Active Eicon DIVA Server cards"
-	depends on NET && ISDN && ISDN_CAPI!=n
-
-config CAPI_EICON
+menuconfig CAPI_EICON
 	bool "Support Eicon cards"
+	depends on NET && ISDN && ISDN_CAPI!=n
 	help
 	  Enable support for Eicon Networks active ISDN cards.
@@ -49,5 +47,2 @@ config ISDN_DIVAS_MAINT
 	help
 	  Enable Divas Maintainance driver.
-
-endmenu
-
--- rc1-a/drivers/scsi/Kconfig	2005-06-30 11:22:39.000000000 +0200
+++ rc1-b/drivers/scsi/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,5 +1,3 @@
-menu "SCSI device support"
-
-config SCSI
+menuconfig SCSI
 	tristate "SCSI device support"
 	---help---
@@ -1793,4 +1791,2 @@ endmenu
 
 source "drivers/scsi/pcmcia/Kconfig"
-
-endmenu
--- rc1-a/drivers/scsi/pcmcia/Kconfig	2004-08-14 07:37:25.000000000 +0200
+++ rc1-b/drivers/scsi/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,7 +3,10 @@
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n && MODULES
 
+if SCSI_PCMCIA
+
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
@@ -80,3 +83,3 @@ config PCMCIA_SYM53C500
 	  module will be called sym53c500_cs.
 
-endmenu
+endif
--- rc1-a/drivers/infiniband/Kconfig	2005-06-30 11:20:30.000000000 +0200
+++ rc1-b/drivers/infiniband/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,5 +1,3 @@
-menu "InfiniBand support"
-
-config INFINIBAND
+menuconfig INFINIBAND
 	tristate "InfiniBand support"
 	---help---
@@ -11,4 +9,2 @@ source "drivers/infiniband/hw/mthca/Kcon
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
-
-endmenu
--- rc1-a/drivers/cdrom/Kconfig	2005-06-30 11:21:32.000000000 +0200
+++ rc1-b/drivers/cdrom/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,9 +3,7 @@
 #
 
-menu "Old CD-ROM drivers (not SCSI, not IDE)"
+menuconfig CD_NO_IDESCSI
+	bool "Old CD-ROM drivers (not SCSI, IDE or ATAPI)"
 	depends on ISA
-
-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
@@ -210,4 +208,2 @@ config CDU535
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonycd535.
-
-endmenu
--- rc1-a/drivers/media/dvb/Kconfig	2005-06-30 11:22:25.000000000 +0200
+++ rc1-b/drivers/media/dvb/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Digital Video Broadcasting Devices"
-
-config DVB
-	bool "DVB For Linux"
+menuconfig DVB
+	bool "Digital Video Broadcasting Devices"
 	depends on NET && INET
 	---help---
@@ -44,4 +42,2 @@ comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
-
-endmenu
--- rc1-a/drivers/video/logo/Kconfig	2005-06-30 11:21:52.000000000 +0200
+++ rc1-b/drivers/video/logo/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Logo configuration"
-
-config LOGO
-	bool "Bootup logo"
+menuconfig LOGO
+	bool "Bootup logo configuration"
 	depends on FB || SGI_NEWPORT_CONSOLE
 
@@ -63,5 +61,2 @@ config LOGO_SUPERH_CLUT224
 	depends on LOGO && SUPERH
 	default y
-
-endmenu
-
--- rc1-a/drivers/message/i2o/Kconfig	2005-06-30 11:22:26.000000000 +0200
+++ rc1-b/drivers/message/i2o/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,3 @@
-
-menu "I2O device support"
-
-config I2O
+menuconfig I2O
 	tristate "I2O support"
 	depends on PCI
@@ -107,5 +104,2 @@ config I2O_PROC
 	  To compile this support as a module, choose M here: the
 	  module will be called i2o_proc.
-
-endmenu
-
--- rc1-a/drivers/message/fusion/Kconfig	2005-06-30 11:22:25.000000000 +0200
+++ rc1-b/drivers/message/fusion/Kconfig	2005-06-30 11:13:57.000000000 +0200
@@ -1,4 +1,7 @@
 
-menu "Fusion MPT device support"
+menuconfig FUSION_DEVICES
+	bool "Fusion MPT device support"
+
+if FUSION_DEVICES
 
 config FUSION
@@ -84,3 +87,3 @@ config FUSION_LAN
 	  If unsure whether you really want or need this, say N.
 
-endmenu
+endif
--- rc1-a/drivers/ieee1394/Kconfig	2005-06-30 11:21:33.000000000 +0200
+++ rc1-b/drivers/ieee1394/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,7 +1,5 @@
 # -*- shell-script -*-
 
-menu "IEEE 1394 (FireWire) support"
-
-config IEEE1394
+menuconfig IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
 	depends on PCI || BROKEN
@@ -180,4 +178,2 @@ config IEEE1394_AMDTP
 	  To compile this driver as a module, say M here: the
 	  module will be called amdtp.
-
-endmenu
--- rc1-a/drivers/pcmcia/Kconfig	2005-06-30 11:22:38.000000000 +0200
+++ rc1-b/drivers/pcmcia/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
 	tristate "PCCard (PCMCIA/CardBus) support"
 	select HOTPLUG
@@ -229,4 +227,2 @@ config PCCARD_NONSTATIC
 
 endif	# PCCARD
-
-endmenu
--- rc1-a/drivers/telephony/Kconfig	2004-08-14 07:36:32.000000000 +0200
+++ rc1-b/drivers/telephony/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Telephony Support"
-
-config PHONE
-	tristate "Linux telephony support"
+menuconfig PHONE
+	tristate "Telephony support"
 	---help---
 	  Say Y here if you have a telephony card, which for example allows
@@ -43,5 +41,2 @@ config PHONE_IXJ_PCMCIA
 	  cards manufactured by Quicknet Technologies, Inc.  This changes the
 	  card initialization code to work with the card manager daemon.
-
-endmenu
-
--- rc1-a/drivers/parport/Kconfig	2005-06-30 11:21:45.000000000 +0200
+++ rc1-b/drivers/parport/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -6,7 +6,5 @@
 #
 
-menu "Parallel port support"
-
-config PARPORT
+menuconfig PARPORT
 	tristate "Parallel port support"
 	---help---
@@ -84,4 +82,5 @@ config PARPORT_PC_PCMCIA
 
 config PARPORT_NOT_PC
+	depends on PARPORT
 	bool
 
@@ -141,5 +140,2 @@ config PARPORT_1284
 	  transfer modes. Also say Y if you want device ID information to
 	  appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
-
-endmenu
-
--- rc1-a/fs/nls/Kconfig	2004-08-14 07:36:10.000000000 +0200
+++ rc1-b/fs/nls/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -3,8 +3,6 @@
 #
 
-menu "Native Language Support"
-
-config NLS
-	tristate "Base native language support"
+menuconfig NLS
+	tristate "Native language support"
 	---help---
 	  The base Native Language Support. A number of filesystems
@@ -501,4 +499,2 @@ config NLS_UTF8
 	  the Unicode/ISO9646 universal character set.
 
-endmenu
-
--- rc1-a/fs/xfs/Kconfig	2005-06-30 11:20:52.000000000 +0200
+++ rc1-b/fs/xfs/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1,6 +1,4 @@
-menu "XFS support"
-
-config XFS_FS
-	tristate "XFS filesystem support"
+menuconfig XFS_FS
+	tristate "XFS support"
 	select EXPORTFS if NFSD!=n
 	help
@@ -21,11 +19,13 @@ config XFS_FS
 	  to use an initial ramdisk (initrd) to boot.
 
+if XFS_FS
+
 config XFS_EXPORT
 	bool
-	default y if XFS_FS && EXPORTFS
+	default y if EXPORTFS
 
 config XFS_RT
 	bool "Realtime support (EXPERIMENTAL)"
-	depends on XFS_FS && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  If you say Y here you will be able to mount and use XFS filesystems
@@ -44,5 +44,4 @@ config XFS_RT
 config XFS_QUOTA
 	bool "Quota support"
-	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
@@ -61,5 +60,4 @@ config XFS_QUOTA
 config XFS_SECURITY
 	bool "Security Label support"
-	depends on XFS_FS
 	help
 	  Security labels support alternative access control models
@@ -73,5 +71,4 @@ config XFS_SECURITY
 config XFS_POSIX_ACL
 	bool "POSIX ACL support"
-	depends on XFS_FS
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
@@ -83,3 +80,3 @@ config XFS_POSIX_ACL
 	  If you don't know what Access Control Lists are, say N.
 
-endmenu
+endif
--- rc1-a/fs/Kconfig	2005-06-30 11:22:41.000000000 +0200
+++ rc1-b/fs/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -1728,10 +1728,6 @@ config RXRPC
 endmenu
 
-menu "Partition Types"
-
 source "fs/partitions/Kconfig"
 
-endmenu
-
 source "fs/nls/Kconfig"
 
--- rc1-a/init/Kconfig	2005-06-30 11:22:50.000000000 +0200
+++ rc1-b/init/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -392,8 +392,6 @@ config BASE_SMALL
 	default 1 if !BASE_FULL
 
-menu "Loadable module support"
-
-config MODULES
-	bool "Enable loadable module support"
+menuconfig MODULES
+	bool "Loadable module support"
 	help
 	  Kernel modules are small pieces of compiled code which can
@@ -414,7 +412,8 @@ config MODULES
 	  If unsure, say Y.
 
+if MODULES
+
 config MODULE_UNLOAD
 	bool "Module unloading"
-	depends on MODULES
 	help
 	  Without this option you will not be able to unload any
@@ -436,5 +435,4 @@ config OBSOLETE_MODPARM
 	bool
 	default y
-	depends on MODULES
 	help
 	  You need this option to use module parameters on modules which
@@ -444,5 +442,5 @@ config OBSOLETE_MODPARM
 config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
-	depends on MODULES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	help
 	  Usually, you have to use modules compiled with your kernel.
@@ -455,5 +453,4 @@ config MODVERSIONS
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
@@ -467,5 +464,4 @@ config MODULE_SRCVERSION_ALL
 config KMOD
 	bool "Automatic kernel module loading"
-	depends on MODULES
 	help
 	  Normally when you have selected some parts of the kernel to
@@ -483,3 +479,4 @@ config STOP_MACHINE
 	help
 	  Need stop_machine() primitive.
-endmenu
+
+endif
--- rc1-a/sound/Kconfig	2005-06-30 11:22:53.000000000 +0200
+++ rc1-b/sound/Kconfig	2005-06-30 11:06:30.000000000 +0200
@@ -2,7 +2,5 @@
 #
 
-menu "Sound"
-
-config SOUND
+menuconfig SOUND
 	tristate "Sound card support"
 	help
@@ -33,12 +31,11 @@ config SOUND
 	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
 
+if SOUND
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 
-menu "Advanced Linux Sound Architecture"
-	depends on SOUND!=n
-
-config SND
+menuconfig SND
 	tristate "Advanced Linux Sound Architecture"
 	depends on SOUND
@@ -75,12 +72,7 @@ source "sound/sparc/Kconfig"
 source "sound/parisc/Kconfig"
 
-endmenu
-
-menu "Open Sound System"
-	depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
-
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
+	depends on SOUND && (BROKEN || (!SPARC32 && !SPARC64))
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
@@ -88,7 +80,5 @@ config SOUND_PRIME
 source "sound/oss/Kconfig"
 
-endmenu
-
 endif
 
-endmenu
+endif
--- x/fs/partitions/Kconfig	2005-07-04 13:50:38.000000000 +0200
+++ b/fs/partitions/Kconfig	2005-06-30 09:39:18.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # Partition configuration
 #
-config PARTITION_ADVANCED
+menuconfig PARTITION_ADVANCED
 	bool "Advanced partition selection"
 	help
 	  Say Y here if you would like to use hard disks under Linux which
--- x/sound/oss/Kconfig	2005-07-04 13:50:55.000000000 +0200
+++ b/sound/oss/Kconfig	2005-06-29 16:49:05.000000000 +0200
@@ -1084,7 +1084,7 @@ config SOUND_TVMIXER
 
 config SOUND_KAHLUA
 	tristate "XpressAudio Sound Blaster emulation"
-	depends on SOUND_SB
+	depends on SOUND_SB && SOUND_PRIME
 
 config SOUND_ALI5455
 	tristate "ALi5455 audio support"
--- x/sound/oss/dmasound/Kconfig	2005-07-04 13:47:08.000000000 +0200
+++ b/sound/oss/dmasound/Kconfig	2005-06-29 16:45:48.000000000 +0200
@@ -56,3 +56,4 @@ config DMASOUND_Q40
 
 config DMASOUND
 	tristate
+	depends on SOUND
-- 
Top 100 things you don't want the sysadmin to say:
44. System coming down in 0 min....

[PATCH] Kconfig changes 6: Move the Fusion MPT menu

[Bodo Eggert]

On Mon, 4 Jul 2005, Bodo Eggert wrote:

> Part 4: The profiling menu.
       ^
Obviously I can't count to 5.

And now to something completely different:

The Fusion MPT controler seems to belong into the SCSI low level driver 
submenu. I may well be wrong here.

patch is for 2.6.12, 2.6.13 will be posted in a reply

--- a/./arch/arm/Kconfig	2005-07-04 12:44:17.000000000 +0200
+++ b/./arch/arm/Kconfig	2005-07-04 13:04:23.000000000 +0200
@@ -695,8 +695,6 @@ source "drivers/scsi/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
--- a/./arch/v850/Kconfig	2005-05-02 02:25:41.000000000 +0200
+++ b/./arch/v850/Kconfig	2005-07-04 13:05:04.000000000 +0200
@@ -275,8 +275,6 @@ endmenu
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
--- a/./arch/sparc64/Kconfig	2005-06-19 14:16:20.000000000 +0200
+++ b/./arch/sparc64/Kconfig	2005-07-04 13:05:19.000000000 +0200
@@ -506,10 +506,6 @@ source "drivers/fc4/Kconfig"
 
 source "drivers/md/Kconfig"
 
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
 source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
--- a/./drivers/scsi/Kconfig	2005-07-04 11:10:43.000000000 +0200
+++ b/./drivers/scsi/Kconfig	2005-07-04 13:13:38.000000000 +0200
@@ -1489,19 +1489,6 @@ config SCSI_NSP32
 	  To compile this driver as a module, choose M here: the
 	  module will be called 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
-	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel
-	  RAM as storage (i.e. it is a ramdisk). To save space when multiple
-	  dummy disks are simulated, they share the same kernel RAM for 
-	  their storage. See <http://www.torque.net/sg/sdebug.html> for more
-	  information. This driver is primarily of use to those testing the
-	  SCSI and block subsystems. If unsure, say N.
-
 config SCSI_MESH
 	tristate "MESH (Power Mac internal SCSI) support"
 	depends on PPC32 && PPC_PMAC && SCSI
@@ -1791,6 +1778,21 @@ config ZFCP
           called zfcp. If you want to compile it as a module, say M here
           and read <file:Documentation/modules.txt>.
 
-endmenu
+source "drivers/message/fusion/Kconfig"
 
 source "drivers/scsi/pcmcia/Kconfig"
+
+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
+	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel
+	  RAM as storage (i.e. it is a ramdisk). To save space when multiple
+	  dummy disks are simulated, they share the same kernel RAM for 
+	  their storage. See <http://www.torque.net/sg/sdebug.html> for more
+	  information. This driver is primarily of use to those testing the
+	  SCSI and block subsystems. If unsure, say N.
+
+endmenu
--- a/./drivers/Kconfig	2005-05-02 02:25:41.000000000 +0200
+++ b/./drivers/Kconfig	2005-07-04 13:05:25.000000000 +0200
@@ -20,8 +20,6 @@ source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
-- 
S.U.Z.U.K.I.: Synthetic Unit Zoned for Ultimate Killing and Infiltration
        -- http://www.brunching.com/toys/toy-cyborger.html

Re: [PATCH] Kconfig changes 6: Move the Fusion MPT menu

[Bodo Eggert]

On Mon, 4 Jul 2005, Bodo Eggert wrote:

> And now to something completely different:
> 
> The Fusion MPT controler seems to belong into the SCSI low level driver 
> submenu. I may well be wrong here.

patch is for 2.6.13

--- rc1-a/arch/arm/Kconfig	2005-07-04 15:28:02.000000000 +0200
+++ rc1-b/arch/arm/Kconfig	2005-07-04 13:14:57.000000000 +0200
@@ -720,8 +720,6 @@ source "drivers/scsi/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
--- rc1-a/arch/v850/Kconfig	2005-07-04 15:28:02.000000000 +0200
+++ rc1-b/arch/v850/Kconfig	2005-07-04 13:14:57.000000000 +0200
@@ -277,8 +277,6 @@ endmenu
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
--- rc1-a/arch/sparc64/Kconfig	2005-07-04 15:28:02.000000000 +0200
+++ rc1-b/arch/sparc64/Kconfig	2005-07-04 13:14:57.000000000 +0200
@@ -508,10 +508,6 @@ source "drivers/fc4/Kconfig"
 
 source "drivers/md/Kconfig"
 
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
 source "drivers/ieee1394/Kconfig"
 
 source "net/Kconfig"
--- rc1-a/drivers/scsi/Kconfig	2005-07-04 15:28:02.000000000 +0200
+++ rc1-b/drivers/scsi/Kconfig	2005-07-04 14:39:15.000000000 +0200
@@ -1485,19 +1485,6 @@ config SCSI_NSP32
 	  To compile this driver as a module, choose M here: the
 	  module will be called 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
-	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel
-	  RAM as storage (i.e. it is a ramdisk). To save space when multiple
-	  dummy disks are simulated, they share the same kernel RAM for 
-	  their storage. See <http://www.torque.net/sg/sdebug.html> for more
-	  information. This driver is primarily of use to those testing the
-	  SCSI and block subsystems. If unsure, say N.
-
 config SCSI_MESH
 	tristate "MESH (Power Mac internal SCSI) support"
 	depends on PPC32 && PPC_PMAC && SCSI
@@ -1787,6 +1774,21 @@ config ZFCP
           called zfcp. If you want to compile it as a module, say M here
           and read <file:Documentation/modules.txt>.
 
-endmenu
+source "drivers/message/fusion/Kconfig"
 
 source "drivers/scsi/pcmcia/Kconfig"
+
+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
+	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel
+	  RAM as storage (i.e. it is a ramdisk). To save space when multiple
+	  dummy disks are simulated, they share the same kernel RAM for 
+	  their storage. See <http://www.torque.net/sg/sdebug.html> for more
+	  information. This driver is primarily of use to those testing the
+	  SCSI and block subsystems. If unsure, say N.
+
+endmenu
--- rc1-a/drivers/cpufreq/Kconfig	2005-06-30 11:21:33.000000000 +0200
+++ rc1-b/drivers/cpufreq/Kconfig	2005-07-04 14:51:28.000000000 +0200
@@ -1,4 +1,4 @@
-config CPU_FREQ
+menuconfig CPU_FREQ
 	bool "CPU Frequency scaling"
 	help
 	  CPU Frequency scaling allows you to change the clock speed of 
--- rc1-a/drivers/message/fusion/Kconfig	2005-07-04 14:39:33.000000000 +0200
+++ rc1-b/drivers/message/fusion/Kconfig	2005-07-04 15:25:41.000000000 +0200
@@ -1,6 +1,7 @@
 
 menuconfig FUSION_DEVICES
 	bool "Fusion MPT device support"
+	depends on PCI && SCSI
 
 if FUSION_DEVICES
 
@@ -10,7 +11,6 @@ config FUSION
 
 config FUSION_SPI
 	tristate "Fusion MPT ScsiHost drivers for SPI"
-	depends on PCI && SCSI
 	select FUSION
 	---help---
 	  SCSI HOST support for a parallel SCSI host adapters.
@@ -24,7 +24,6 @@ config FUSION_SPI
 
 config FUSION_FC
 	tristate "Fusion MPT ScsiHost drivers for FC"
-	depends on PCI && SCSI
 	select FUSION
 	---help---
 	  SCSI HOST support for a Fiber Channel host adapters.
--- rc1-a/drivers/Kconfig	2005-07-04 15:28:02.000000000 +0200
+++ rc1-b/drivers/Kconfig	2005-07-04 13:14:57.000000000 +0200
@@ -20,8 +20,6 @@ source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "drivers/message/fusion/Kconfig"
-
 source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
-- 
Top 100 things you don't want the sysadmin to say:
26. What happens to a Hard Disk when you drop it?