2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 372723161c97..07a69117cae4 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -291,8 +291,12 @@ source "drivers/scsi/libsas/Kconfig"
 
 endmenu
 
-menu "SCSI low-level drivers"
+menuconfig SCSI_LOWLEVEL
+        bool "SCSI low-level drivers"
         depends on SCSI!=n
+        default y
+
+if SCSI_LOWLEVEL
 
 config ISCSI_TCP
         tristate "iSCSI Initiator over TCP/IP"
@@ -1800,7 +1804,7 @@ config SCSI_SRP
           To compile this driver as a module, choose M here: the
           module will be called libsrp.
 
-endmenu
+endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"
 
diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index 7dd787f6ab27..fa481b515ead 100644
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -2,9 +2,12 @@
 # PCMCIA SCSI adapter configuration
 #
 
-menu "PCMCIA SCSI adapter support"
+menuconfig SCSI_LOWLEVEL_PCMCIA
+        bool "PCMCIA SCSI adapter support"
         depends on SCSI!=n && PCMCIA!=n
 
+if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA
+
 config PCMCIA_AHA152X
         tristate "Adaptec AHA152X PCMCIA support"
         depends on !64BIT
@@ -77,4 +80,4 @@ config PCMCIA_SYM53C500
           To compile this driver as a module, choose M here: the
           module will be called sym53c500_cs.
 
-endmenu
+endif # SCSI_LOWLEVEL_PCMCIA