diff --git a/[refs] b/[refs]
index 3c84d1813235..98c8078c502b 100644
--- 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
index b923074b2cbe..30f06e956bfb 100644
--- 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
index 3998dd620a03..7b2ce4a08524 100644
--- 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