Use menuconfig objects: W1

Use menuconfigs instead of menus, so the whole menu can be disabled at once
instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 4 deletions

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.