X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fw1%2FKconfig;h=6854fd6b9714a2a03752f70becce39d4780f6147;hb=bfcf02edeca0bb72873f05f7b425cca7893a5b2d;hp=27c9d05d03ef23f1280754fab152393d6995bb14;hpb=e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 27c9d05d03e..6854fd6b971 100644
--- 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 ---
@@ -27,4 +27,4 @@ config W1_CON
 source drivers/w1/masters/Kconfig
 source drivers/w1/slaves/Kconfig
 
-endmenu
+endif # W1