diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 19:41:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 19:41:13 -0500 |
| commit | 31c67c755363c7e7821221e72f8594ab8995764d (patch) | |
| tree | a55fea1c515e4738b426af02da02598371ac8bb8 /drivers/media/video | |
| parent | 47ad504c56235c7c7c0020e631651420a55c74e7 (diff) | |
| parent | 307991055b0ce65d53dc1eb501c456c10eb36360 (diff) | |
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/media/video')
| -rw-r--r-- | drivers/media/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index ac16e815e275..6830d2848bd7 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -112,7 +112,7 @@ config VIDEO_IR_I2C | |||
| 112 | # | 112 | # |
| 113 | 113 | ||
| 114 | menu "Encoders/decoders and other helper chips" | 114 | menu "Encoders/decoders and other helper chips" |
| 115 | depends on !VIDEO_HELPER_CHIPS_AUTO | 115 | visible if !VIDEO_HELPER_CHIPS_AUTO |
| 116 | 116 | ||
| 117 | comment "Audio decoders" | 117 | comment "Audio decoders" |
| 118 | 118 | ||