musb_hdrc cleanup -- cppi and sparse

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

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 8b3d0f0c7bd540b697ae4960a1734cfb5a4ea221..6854fd6b9714a2a03752f70becce39d4780f6147 100644 (file)
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,8 +1,6 @@
-menu "Dallas's 1-wire bus"
-
-config W1
+menuconfig W1
        tristate "Dallas's 1-wire support"
-       depends on CONNECTOR
+       depends on HAS_IOMEM
        ---help---
          Dallas' 1-wire bus is useful to connect slow 1-pin devices
          such as iButtons and thermal sensors.
@@ -12,8 +10,10 @@ config W1
          This W1 support can also be built as a module.  If so, the module
          will be called wire.ko.
 
+if W1
+
 config W1_CON
-       depends on CONNECTOR && W1
+       depends on CONNECTOR
        bool "Userspace communication over connector"
        default y
        --- help ---
@@ -21,10 +21,10 @@ config W1_CON
          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