vhost-net: switch to smp barriers

[safe/jmp/linux-2.6] / drivers / w1 / Kconfig

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 1d5d087..fd2c7bd 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,64 +1,31 @@
-menu "Dallas's 1-wire bus"
-
-config W1
+menuconfig W1
        tristate "Dallas's 1-wire support"
+       depends on HAS_IOMEM
        ---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 && 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).
-
-endmenu
+         will be called wire.
+
+if W1
+
+config W1_CON
+       depends on CONNECTOR
+       bool "Userspace communication over connector"
+       default y
+       --- help ---
+         This allows to communicate with userspace using connector. For more
+         information see <file:Documentation/connector/connector.txt>.
+         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
+
+endif # W1