diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-06 01:41:13 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-06 01:41:13 +0100 |
commit | 31c67c755363c7e7821221e72f8594ab8995764d (patch) | |
tree | a55fea1c515e4738b426af02da02598371ac8bb8 /drivers/media/dvb/frontends/Kconfig | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/pa... (diff) | |
parent | Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-31c67c755363c7e7821221e72f8594ab8995764d.tar.xz linux-31c67c755363c7e7821221e72f8594ab8995764d.zip |
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/dvb/frontends/Kconfig')
-rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index e9062b08a485..96b27016670e 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig @@ -12,9 +12,8 @@ config DVB_FE_CUSTOMISE If unsure say N. -if DVB_FE_CUSTOMISE - menu "Customise DVB Frontends" + visible if DVB_FE_CUSTOMISE comment "Multistandard (satellite) frontends" depends on DVB_CORE @@ -619,5 +618,3 @@ config DVB_DUMMY_FE tristate "Dummy frontend driver" default n endmenu - -endif |