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

Commit 445c2714 authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8534): remove select's of FW_LOADER 



After commit d9b19199
(always enable FW_LOADER unless EMBEDDED=y) we can remove
the FW_LOADER select's and corresponding dependencies
on HOTPLUG.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 9fa0f6db

drivers/media/common/tuners/Kconfig

+2 −7
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ config MEDIA_TUNER 
	tristate

	default VIDEO_MEDIA && I2C

	depends on VIDEO_MEDIA && I2C

	select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -138,8 +137,6 @@ config MEDIA_TUNER_QT1010 
config MEDIA_TUNER_XC2028

	tristate "XCeive xc2028/xc3028 tuners"

	depends on VIDEO_MEDIA && I2C

	depends on HOTPLUG

	select FW_LOADER

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the xc2028/xc3028 tuners.
@@ -147,8 +144,6 @@ config MEDIA_TUNER_XC2028 
config MEDIA_TUNER_XC5000

	tristate "Xceive XC5000 silicon tuner"

	depends on VIDEO_MEDIA && I2C

	depends on HOTPLUG

	select FW_LOADER

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon tuner XC5000 from Xceive.

drivers/media/dvb/bt8xx/Kconfig

+0 −2
Original line number Diff line number Diff line 
config DVB_BT8XX

	tristate "BT8xx based PCI cards"

	depends on DVB_CORE && PCI && I2C && VIDEO_BT848

	depends on HOTPLUG	# due to FW_LOADER

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	select DVB_SP887X if !DVB_FE_CUSTOMISE

	select DVB_NXT6000 if !DVB_FE_CUSTOMISE
@@ -10,7 +9,6 @@ config DVB_BT8XX 
	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select FW_LOADER

	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

+0 −2
Original line number Diff line number Diff line 
config DVB_USB

	tristate "Support for various USB DVB devices"

	depends on DVB_CORE && USB && I2C && INPUT

	depends on HOTPLUG	# due to FW_LOADER

	select FW_LOADER

	help

	  By enabling this you will be able to choose the various supported

	  USB1.1 and USB2.0 DVB devices.

drivers/media/dvb/frontends/Kconfig

+8 −16
Original line number Diff line number Diff line
@@ -97,9 +97,8 @@ comment "DVB-T (terrestrial) frontends" 


config DVB_SP8870

	tristate "Spase sp8870 based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -110,9 +109,8 @@ config DVB_SP8870 


config DVB_SP887X

	tristate "Spase sp887x based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -158,9 +156,8 @@ config DVB_L64781 


config DVB_TDA1004X

	tristate "Philips TDA10045H/TDA10046H based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -225,9 +222,8 @@ config DVB_DIB7000P 


config DVB_TDA10048

	tristate "Philips TDA10048HN based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -267,9 +263,8 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends" 


config DVB_NXT200X

	tristate "NxtWave Communications NXT2002/NXT2004 based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want

	  to support this frontend.
@@ -282,9 +277,8 @@ config DVB_NXT200X 


config DVB_OR51211

	tristate "Oren OR51211 based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
@@ -295,9 +289,8 @@ config DVB_OR51211 


config DVB_OR51132

	tristate "Oren OR51132 based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want

	  to support this frontend.
@@ -311,9 +304,8 @@ config DVB_OR51132 


config DVB_BCM3510

	tristate "Broadcom BCM3510"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to

	  support this frontend.

drivers/media/dvb/ttpci/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ config TTPCI_EEPROM 
config DVB_AV7110

	tristate "AV7110 cards"

	depends on DVB_CORE && PCI && I2C

	depends on HOTPLUG

	select FW_LOADER if !DVB_AV7110_FIRMWARE

	select TTPCI_EEPROM

	select VIDEO_SAA7146_VV

	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV
@@ -127,14 +125,12 @@ config DVB_BUDGET_AV 
	depends on DVB_BUDGET_CORE && I2C

	select VIDEO_SAA7146_VV

	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV

	depends on HOTPLUG	# dependency of FW_LOADER

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_TDA1004X if !DVB_FE_CUSTOMISE

	select DVB_TDA10021 if !DVB_FE_CUSTOMISE

	select DVB_TDA10023 if !DVB_FE_CUSTOMISE

	select DVB_TUA6100 if !DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  Support for simple SAA7146 based DVB cards

	  (so called Budget- or Nova-PCI cards) without onboard