---

yaml --- r: 222937 b: refs/heads/master c: dfc518d h: refs/heads/master i: 222935: d730006 v: v3
git-mirror · Nov 22, 2010 · f7f5cef · f7f5cef
1 parent 1d52b4b
commit f7f5cef
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09899c93b183870b122c94317f63344df43368e9
+refs/heads/master: dfc518dd6b5c5e00f98906eaa5c7d716d856c098
diff --git a/trunk/drivers/i2c/Kconfig b/trunk/drivers/i2c/Kconfig
@@ -75,8 +75,7 @@ config I2C_HELPER_AUTO
 	  In doubt, say Y.
 
 config I2C_SMBUS
-	tristate
-	prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO
+	tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
 	help
 	  Say Y here if you want support for SMBus extensions to the I2C
 	  specification. At the moment, the only supported extension is

diff --git a/trunk/drivers/i2c/algos/Kconfig b/trunk/drivers/i2c/algos/Kconfig
@@ -15,15 +15,3 @@ config I2C_ALGOPCA
 	tristate "I2C PCA 9564 interfaces"
 
 endmenu
-
-# In automatic configuration mode, we still have to define the
-# symbols to avoid unmet dependencies.
-
-if I2C_HELPER_AUTO
-config I2C_ALGOBIT
-	tristate
-config I2C_ALGOPCF
-	tristate
-config I2C_ALGOPCA
-	tristate
-endif