aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Lacombe <lacombar@gmail.com>2010-11-06 18:30:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-11-22 11:27:33 -0200
commitdfc518dd6b5c5e00f98906eaa5c7d716d856c098 (patch)
tree4a78cf323636710e50dc37e571f0a3651ef2bf3c
parent09899c93b183870b122c94317f63344df43368e9 (diff)
downloadmrst-s0i3-test-dfc518dd6b5c5e00f98906eaa5c7d716d856c098.tar.gz
mrst-s0i3-test-dfc518dd6b5c5e00f98906eaa5c7d716d856c098.tar.xz
mrst-s0i3-test-dfc518dd6b5c5e00f98906eaa5c7d716d856c098.zip
Revert "i2c: Fix Kconfig dependencies"
This reverts commit 0a57274ea026c2b7670683947b6cc08b195148cf. Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/i2c/Kconfig3
-rw-r--r--drivers/i2c/algos/Kconfig12
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index b923074b2cb..30f06e956bf 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 3998dd620a0..7b2ce4a0852 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/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