Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / w1 / Kconfig

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 8b3d0f0..5e61ed5 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -2,9 +2,8 @@ menu "Dallas's 1-wire bus"
 
 config W1
        tristate "Dallas's 1-wire support"
-       depends on CONNECTOR
        ---help---
-         Dallas' 1-wire bus is useful to connect slow 1-pin devices
+         Dallas's 1-wire bus is useful to connect slow 1-pin devices
          such as iButtons and thermal sensors.
 
          If you want W1 support, you should say Y here.
@@ -12,18 +11,6 @@ config W1
          This W1 support can also be built as a module.  If so, the module
          will be called wire.ko.
 
-config W1_CON
-       depends on CONNECTOR && W1
-       bool "Userspace communication over connector"
-       default y
-       --- help ---
-         This allows to communicate with userspace using connector [Documentation/connector].
-         There are three types of messages between w1 core and userspace:
-         1. Events. They are generated each time new master or slave device found
-               either due to automatic or requested search.
-         2. Userspace commands. Includes read/write and search/alarm search comamnds.
-         3. Replies to userspace commands.
-
 source drivers/w1/masters/Kconfig
 source drivers/w1/slaves/Kconfig