Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b21c1e9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204 



When the tuner modules were moved to common/tuners, a separate customize
option were added for tuners. However, the automatic selection of the
tuners were still using the older option.

This causes that the automatic selection to fail, if DVB_FE_CUSTOMISE is
selected. Also, since those tuners are now under MEDIA_TUNER_CUSTOMIZE
menu, if you unset MEDIA_TUNER_CUSTOMIZE, you can't manually select the
tuners.

This patch fixes this error by replacing DVB_FE_CUSTOMISE by
MEDIA_TUNER_CUSTOMIZE on all places were a tuner is selected.

The patch were generated by this small script:

for i in `find drivers/media -name Kconfig`; do
  cat $i|perl -ne 's/(MEDIA_TUNER.*)DVB_FE_CUSTOMISE/\1MEDIA_TUNER_CUSTOMIZE/; print $_' >a
  mv a $i
done

Also, manually reordered the tuner entries.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f86d4a91

drivers/media/dvb/b2c2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ config DVB_B2C2_FLEXCOP 
	select DVB_STV0297 if !DVB_FE_CUSTOMISE

	select DVB_BCM3510 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select DVB_S5H1420 if !DVB_FE_CUSTOMISE

	select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE

	select DVB_ISL6421 if !DVB_FE_CUSTOMISE

	select DVB_CX24123 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for the digital TV receiver chip made by B2C2 Inc. included in

	  Technisats PCI cards and USB boxes.

drivers/media/dvb/bt8xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config DVB_BT8XX 
	select DVB_OR51211 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are

	  the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,

drivers/media/dvb/dvb-usb/Kconfig

+23 −23
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ config DVB_USB_A800 
	tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB 
	depends on DVB_USB

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_DIB3000MB

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC 
	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for USB2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -73,11 +73,11 @@ config DVB_USB_DIB0700 
	select DVB_DIB7000M

	select DVB_DIB3000MC

	select DVB_S5H1411 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE

	select DVB_TUNER_DIB0070

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The

	  USB bridge is also present in devices having the DiB7700 DVB-T-USB
@@ -95,7 +95,7 @@ config DVB_USB_UMT_010 
	depends on DVB_USB

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_DIB3000MC

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
@@ -107,11 +107,11 @@ config DVB_USB_CXUSB 
	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE

	select DVB_DIB7000P if !DVB_FE_CUSTOMISE

	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the Conexant USB2.0 hybrid reference design.

	  Currently, only DVB and ATSC modes are supported, analog mode
@@ -124,9 +124,9 @@ config DVB_USB_M920X 
	tristate "Uli m920x DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE

	select DVB_TDA1004X if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.

	  Currently, only devices with a product id of
@@ -137,7 +137,7 @@ config DVB_USB_GL861 
	tristate "Genesys Logic GL861 USB2.0 support"

	depends on DVB_USB

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0

	  receiver with USB ID 0db0:5581.
@@ -146,7 +146,7 @@ config DVB_USB_AU6610 
	tristate "Alcor Micro AU6610 USB2.0 support"

	depends on DVB_USB

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
@@ -198,8 +198,8 @@ config DVB_USB_NOVA_T_USB2 
	tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_DIB3000MC

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
@@ -235,8 +235,8 @@ config DVB_USB_OPERA1 
config DVB_USB_AF9005

	tristate "Afatech AF9005 DVB-T USB1.1 support"

	depends on DVB_USB && EXPERIMENTAL

	select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver

	  and the TerraTec Cinergy T USB XE (Rev.1)
@@ -284,7 +284,7 @@ config DVB_USB_DTV5100 
	tristate "AME DTV-5100 USB2.0 DVB-T support"

	depends on DVB_USB

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.
@@ -293,9 +293,9 @@ config DVB_USB_AF9015 
	depends on DVB_USB && EXPERIMENTAL

	select DVB_AF9013

	select DVB_PLL              if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060   if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_QT1010   if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060   if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_QT1010   if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver

drivers/media/dvb/ttpci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ config DVB_BUDGET_CI 
	select DVB_TDA1004X if !DVB_FE_CUSTOMISE

	select DVB_LNBP21 if !DVB_FE_CUSTOMISE

	select DVB_TDA10023 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE

	select VIDEO_IR

	help

	  Support for simple SAA7146 based DVB cards

drivers/media/video/cx18/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config VIDEO_CX18 
	select VIDEO_CX2341X

	select VIDEO_CS5345

	select DVB_S5H1409 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE

	---help---

	  This is a video4linux driver for Conexant cx23418 based

	  PCI combo video recorder devices.