3 files changed, 9 insertions, 14 deletions

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