From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Thu, 27 Apr 2006 15:40:27 +0000 (+0400)
Subject: [PATCH] w1: clean up W1_CON dependency.
X-Git-Tag: v2.6.18-rc1~1081^2~227^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=30841711c88dc2d9ce31bfa3fa5479aa823804cf;p=linux-2.6-omap-h63xx.git

[PATCH] w1: clean up W1_CON dependency.

If w1 is not enabled, w1_con should not appear in configuration,
even if no logic is turned on without w1.
W1_CON should depend on W1 also.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 0c6c4359bf7..f2d9a08e89a 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -12,7 +12,7 @@ config W1
 	  will be called wire.ko.
 
 config W1_CON
-	depends on CONNECTOR
+	depends on CONNECTOR && W1
 	bool "Userspace communication over connector"
 	default y
 	--- help ---