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 4baf61a..c287a9a 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus"
 config W1
        tristate "Dallas's 1-wire support"
        ---help---
-         Dallas's 1-wire bus is useful 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.
@@ -11,63 +11,19 @@ config W1
          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 && PCI
-       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_DS9490
-       tristate "DS9490R transport layer driver"
-       depends on W1 && USB
-       help
-         Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
-
-         This support is also available as a module.  If so, the module
-         will be called ds9490r.ko.
-
-config W1_DS9490_BRIDGE
-       tristate "DS9490R USB <-> W1 transport layer for 1-wire"
-       depends on W1_DS9490
-       help
-         Say Y here if you want to communicate with your 1-wire devices
-         using DS9490R USB bridge.
-
-         This support is also available as a module.  If so, the module
-         will be called ds_w1_bridge.ko.
-
-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.
-
-config W1_SMEM
-       tristate "Simple 64bit memory family implementation"
-       depends on W1
-       help
-         Say Y here if you want to connect 1-wire
-         simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-config W1_DS2433
-       tristate "4kb EEPROM family support (DS2433)"
-       depends on W1
-       help
-         Say Y here if you want to use a 1-wire
-         4kb EEPROM family device (DS2433).
-
-config W1_DS2433_CRC
-       bool "Protect DS2433 data with a CRC16"
-       depends on W1_DS2433
-       select CRC16
-       help
-         Say Y here to protect DS2433 data with a CRC16.
-         Each block has 30 bytes of data and a two byte CRC16.
-         Full block writes are only allowed if the CRC is valid.
+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.
+
+source drivers/w1/masters/Kconfig
+source drivers/w1/slaves/Kconfig
 
 endmenu