diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
| commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
| tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /drivers/i2c | |
| parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
| parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
| download | linux-67b738ef32df7ec429004866d2a739a3775894d2.tar.bz2 | |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/i2c/algos/Kconfig | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index b923074b2cbe..30f06e956bfb 100644 --- a/drivers/i2c/Kconfig +++ b/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/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig index 3998dd620a03..f1cfe7e5508b 100644 --- a/drivers/i2c/algos/Kconfig +++ b/drivers/i2c/algos/Kconfig @@ -3,7 +3,7 @@ # menu "I2C Algorithms" - depends on !I2C_HELPER_AUTO + visible if !I2C_HELPER_AUTO config I2C_ALGOBIT tristate "I2C bit-banging interfaces" @@ -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 |