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 f2d9a08..fd2c7bd 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,7 +1,6 @@
-menu "Dallas's 1-wire bus"
-
-config W1
+menuconfig W1
        tristate "Dallas's 1-wire support"
+       depends on HAS_IOMEM
        ---help---
          Dallas' 1-wire bus is useful to connect slow 1-pin devices
          such as iButtons and thermal sensors.
@@ -9,21 +8,24 @@ config W1
          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.
+         will be called wire.
+
+if W1
 
 config W1_CON
-       depends on CONNECTOR && W1
+       depends on CONNECTOR
        bool "Userspace communication over connector"
        default y
        --- help ---
-         This allows to communicate with userspace using connector [Documentation/connector].
+         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 comamnds.
+         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
+endif # W1