From f7f5cef6a48dfec7f7551539473b6d8b3655b5dc Mon Sep 17 00:00:00 2001 From: Arnaud Lacombe Date: Sat, 6 Nov 2010 18:30:25 -0300 Subject: [PATCH] --- yaml --- r: 222937 b: refs/heads/master c: dfc518dd6b5c5e00f98906eaa5c7d716d856c098 h: refs/heads/master i: 222935: d7300066ba3456427ae9c9361afe25d94f4bb020 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/Kconfig | 3 +-- trunk/drivers/i2c/algos/Kconfig | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) 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