tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] Fix Kconfig errors due to two visible menus

Use the new visible Kconfig keyword to avoid producing error for two menus
that are visible only if Tuner/frontend customise options are enabled.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Mauro Carvalho Chehab 9b4320b7 c38bd4ff

+5 -8
unified split
+4 -4
drivers/media/common/tuners/Kconfig
··· 31 select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE 32 select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE 33 34 - menuconfig MEDIA_TUNER_CUSTOMISE 35 bool "Customize analog and hybrid tuner modules to build" 36 depends on MEDIA_TUNER 37 default y if EMBEDDED ··· 44 45 If unsure say N. 46 47 - if MEDIA_TUNER_CUSTOMISE 48 49 config MEDIA_TUNER_SIMPLE 50 tristate "Simple tuner support" ··· 186 default m if MEDIA_TUNER_CUSTOMISE 187 help 188 NXP TDA18218 silicon tuner driver. 189 - 190 - endif # MEDIA_TUNER_CUSTOMISE
··· 31 select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE 32 select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE 33 34 + config MEDIA_TUNER_CUSTOMISE 35 bool "Customize analog and hybrid tuner modules to build" 36 depends on MEDIA_TUNER 37 default y if EMBEDDED ··· 44 45 If unsure say N. 46 47 + menu "Customize TV tuners" 48 + visible if MEDIA_TUNER_CUSTOMISE 49 50 config MEDIA_TUNER_SIMPLE 51 tristate "Simple tuner support" ··· 185 default m if MEDIA_TUNER_CUSTOMISE 186 help 187 NXP TDA18218 silicon tuner driver. 188 + endmenu
+1 -4
drivers/media/dvb/frontends/Kconfig
··· 12 13 If unsure say N. 14 15 - if DVB_FE_CUSTOMISE 16 - 17 menu "Customise DVB Frontends" 18 19 comment "Multistandard (satellite) frontends" 20 depends on DVB_CORE ··· 618 tristate "Dummy frontend driver" 619 default n 620 endmenu 621 - 622 - endif
··· 12 13 If unsure say N. 14 15 menu "Customise DVB Frontends" 16 + visible if DVB_FE_CUSTOMISE 17 18 comment "Multistandard (satellite) frontends" 19 depends on DVB_CORE ··· 619 tristate "Dummy frontend driver" 620 default n 621 endmenu