diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:41:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:41:13 -0800 |
| commit | 31c67c755363c7e7821221e72f8594ab8995764d (patch) | |
| tree | a55fea1c515e4738b426af02da02598371ac8bb8 /drivers/i2c/Kconfig | |
| parent | 47ad504c56235c7c7c0020e631651420a55c74e7 (diff) | |
| parent | 307991055b0ce65d53dc1eb501c456c10eb36360 (diff) | |
| download | op-kernel-dev-31c67c755363c7e7821221e72f8594ab8995764d.zip op-kernel-dev-31c67c755363c7e7821221e72f8594ab8995764d.tar.gz | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
initramfs: Really fix build break on symbol-prefixed archs
[media] Fix Kconfig errors due to two visible menus
i2c/algos: convert Kconfig to use the menu's `visible' keyword
media/video: convert Kconfig to use the menu's `visible' keyword
Revert "i2c: Fix Kconfig dependencies"
kconfig: regen parser
kconfig: add an option to determine a menu's visibility
Diffstat (limited to 'drivers/i2c/Kconfig')
| -rw-r--r-- | drivers/i2c/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index b923074..30f06e9 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 |
