Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6

[linux-2.6] / drivers / w1 / Kconfig

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 ---