Skip to content

Commit

Permalink
[media] Fix Kconfig errors due to two visible menus
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Nov 22, 2010
1 parent c38bd4f commit 9b4320b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
8 changes: 4 additions & 4 deletions drivers/media/common/tuners/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ config MEDIA_TUNER
select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE

menuconfig MEDIA_TUNER_CUSTOMISE
config MEDIA_TUNER_CUSTOMISE
bool "Customize analog and hybrid tuner modules to build"
depends on MEDIA_TUNER
default y if EMBEDDED
Expand All @@ -44,7 +44,8 @@ menuconfig MEDIA_TUNER_CUSTOMISE

If unsure say N.

if MEDIA_TUNER_CUSTOMISE
menu "Customize TV tuners"
visible if MEDIA_TUNER_CUSTOMISE

config MEDIA_TUNER_SIMPLE
tristate "Simple tuner support"
Expand Down Expand Up @@ -185,5 +186,4 @@ config MEDIA_TUNER_TDA18218
default m if MEDIA_TUNER_CUSTOMISE
help
NXP TDA18218 silicon tuner driver.

endif # MEDIA_TUNER_CUSTOMISE
endmenu
5 changes: 1 addition & 4 deletions drivers/media/dvb/frontends/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -619,5 +618,3 @@ config DVB_DUMMY_FE
tristate "Dummy frontend driver"
default n
endmenu

endif

0 comments on commit 9b4320b

Please sign in to comment.