fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index f416b64..c287a9a 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -3,29 +3,27 @@ menu "Dallas's 1-wire bus"
 config W1
        tristate "Dallas's 1-wire support"
        ---help---
-         Dallas's 1-wire bus is usefull to connect slow 1-pin devices 
+         Dallas' 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.
 
          This W1 support can also be built as a module.  If so, the module
          will be called wire.ko.
 
-config W1_MATROX
-       tristate "Matrox G400 transport layer for 1-wire"
-       depends on W1
-       help
-         Say Y here if you want to communicate with your 1-wire devices
-         using Matrox's G400 GPIO pins.
-         
-         This support is also available as a module.  If so, the module 
-         will be called matrox_w1.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 commands.
+         3. Replies to userspace commands.
 
-config W1_THERM
-       tristate "Thermal family implementation"
-       depends on W1
-       help
-         Say Y here if you want to connect 1-wire thermal sensors to you
-         wire.
+source drivers/w1/masters/Kconfig
+source drivers/w1/slaves/Kconfig
 
 endmenu