1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 994decc7bcf2..a193dfbf99d2 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -1,14 +1,14 @@
-menu "InfiniBand support"
-        depends on HAS_IOMEM
-
-config INFINIBAND
-        depends on PCI || BROKEN
+menuconfig INFINIBAND
         tristate "InfiniBand support"
+        depends on PCI || BROKEN
+        depends on HAS_IOMEM
         ---help---
           Core support for InfiniBand (IB).  Make sure to also select
           any protocols you wish to use as well as drivers for your
           InfiniBand hardware.
 
+if INFINIBAND
+
 config INFINIBAND_USER_MAD
         tristate "InfiniBand userspace MAD support"
         depends on INFINIBAND
@@ -20,7 +20,6 @@ config INFINIBAND_USER_MAD
 
 config INFINIBAND_USER_ACCESS
         tristate "InfiniBand userspace access (verbs and CM)"
-        depends on INFINIBAND
         ---help---
           Userspace InfiniBand access support.  This enables the
           kernel side of userspace verbs and the userspace
@@ -37,7 +36,7 @@ config INFINIBAND_USER_MEM
 
 config INFINIBAND_ADDR_TRANS
         bool
-        depends on INFINIBAND && INET
+        depends on INET
         default y
 
 source "drivers/infiniband/hw/mthca/Kconfig"
@@ -54,4 +53,4 @@ source "drivers/infiniband/ulp/srp/Kconfig"
 
 source "drivers/infiniband/ulp/iser/Kconfig"
 
-endmenu
+endif # INFINIBAND