[PATCH] w1: clean up W1_CON dependency.

If w1 is not enabled, w1_con should not appear in configuration,
even if no logic is turned on without w1.
W1_CON should depend on W1 also.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 0c6c4359bf7beb62f08258142f294cbbf0ab505c..f2d9a08e89ae277b4d95cd42e4e44c88310753cc 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -12,7 +12,7 @@ config W1
          will be called wire.ko.
 
 config W1_CON
-       depends on CONNECTOR
+       depends on CONNECTOR && W1
        bool "Userspace communication over connector"
        default y
        --- help ---