diff options
| author | Arnaud Lacombe <lacombar@gmail.com> | 2010-11-06 17:30:25 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-22 08:27:33 -0500 |
| commit | dfc518dd6b5c5e00f98906eaa5c7d716d856c098 (patch) | |
| tree | 4a78cf323636710e50dc37e571f0a3651ef2bf3c | |
| parent | 09899c93b183870b122c94317f63344df43368e9 (diff) | |
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/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/i2c/algos/Kconfig | 12 |
2 files changed, 1 insertions, 14 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 | |||
| 75 | In doubt, say Y. | 75 | In doubt, say Y. |
| 76 | 76 | ||
| 77 | config I2C_SMBUS | 77 | config I2C_SMBUS |
| 78 | tristate | 78 | tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO |
| 79 | prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO | ||
| 80 | help | 79 | help |
| 81 | Say Y here if you want support for SMBus extensions to the I2C | 80 | Say Y here if you want support for SMBus extensions to the I2C |
| 82 | specification. At the moment, the only supported extension is | 81 | specification. At the moment, the only supported extension is |
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig index 3998dd620a03..7b2ce4a08524 100644 --- a/drivers/i2c/algos/Kconfig +++ b/drivers/i2c/algos/Kconfig | |||
| @@ -15,15 +15,3 @@ config I2C_ALGOPCA | |||
| 15 | tristate "I2C PCA 9564 interfaces" | 15 | tristate "I2C PCA 9564 interfaces" |
| 16 | 16 | ||
| 17 | endmenu | 17 | endmenu |
| 18 | |||
| 19 | # In automatic configuration mode, we still have to define the | ||
| 20 | # symbols to avoid unmet dependencies. | ||
| 21 | |||
| 22 | if I2C_HELPER_AUTO | ||
| 23 | config I2C_ALGOBIT | ||
| 24 | tristate | ||
| 25 | config I2C_ALGOPCF | ||
| 26 | tristate | ||
| 27 | config I2C_ALGOPCA | ||
| 28 | tristate | ||
| 29 | endif | ||
