Sfoglia il codice sorgente

[SCSI] Use menuconfig objects

Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu",
so that the user can disable all the options in that menu at once
instead of having to disable each option separately.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Jan Engelhardt 18 anni fa
parent
commit
fc6e740d0b
2 ha cambiato i file con 11 aggiunte e 4 eliminazioni
  1. 6 2
      drivers/scsi/Kconfig
  2. 5 2
      drivers/scsi/pcmcia/Kconfig

+ 6 - 2
drivers/scsi/Kconfig

@@ -291,8 +291,12 @@ source "drivers/scsi/libsas/Kconfig"
 
 
 endmenu
 endmenu
 
 
-menu "SCSI low-level drivers"
+menuconfig SCSI_LOWLEVEL
+	bool "SCSI low-level drivers"
 	depends on SCSI!=n
 	depends on SCSI!=n
+	default y
+
+if SCSI_LOWLEVEL
 
 
 config ISCSI_TCP
 config ISCSI_TCP
 	tristate "iSCSI Initiator over TCP/IP"
 	tristate "iSCSI Initiator over TCP/IP"
@@ -1800,7 +1804,7 @@ config SCSI_SRP
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called libsrp.
 	  module will be called libsrp.
 
 
-endmenu
+endif # SCSI_LOWLEVEL
 
 
 source "drivers/scsi/pcmcia/Kconfig"
 source "drivers/scsi/pcmcia/Kconfig"
 
 

+ 5 - 2
drivers/scsi/pcmcia/Kconfig

@@ -2,9 +2,12 @@
 # PCMCIA SCSI adapter configuration
 # PCMCIA SCSI adapter configuration
 #
 #
 
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_LOWLEVEL_PCMCIA
+	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n
 	depends on SCSI!=n && PCMCIA!=n
 
 
+if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA
+
 config PCMCIA_AHA152X
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
 	tristate "Adaptec AHA152X PCMCIA support"
 	depends on !64BIT
 	depends on !64BIT
@@ -77,4 +80,4 @@ config PCMCIA_SYM53C500
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called sym53c500_cs.
 	  module will be called sym53c500_cs.
 
 
-endmenu
+endif # SCSI_LOWLEVEL_PCMCIA