mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
V4L/DVB (7851): Fix FW_LOADER depencency at v4l/dvb
Since: 1) FW_LOADER is defined as: config FW_LOADER tristate "Userspace firmware loading support" depends on HOTPLUG 2) several V4L/DVB driver just selects it; 3) select is not smart enough to auto-select HOTPLUG, if select FW_LOADER. So, All drivers that select FW_LOADER should also depend on HOTPLUG. An easier solution (for the end-user perspective) would be to "select HOTPLUG". However, live is not simple. This would cause recursive dependency issues like this one: drivers/usb/Kconfig:62:error: found recursive dependency: USB -> USB_OHCI_HCD -> I2C -> MEDIA_TUNER -> MEDIA_TUNER_XC2028 -> HOTPLUG -> PCCARD -> PCMCIA -> USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
ec44c9aed0
commit
755a18baad
13 changed files with 23 additions and 8 deletions
|
@ -131,6 +131,7 @@ config MEDIA_TUNER_XC2028
|
||||||
|
|
||||||
config MEDIA_TUNER_XC5000
|
config MEDIA_TUNER_XC5000
|
||||||
tristate "Xceive XC5000 silicon tuner"
|
tristate "Xceive XC5000 silicon tuner"
|
||||||
|
depends on HOTPLUG
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
help
|
help
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config DVB_BT8XX
|
config DVB_BT8XX
|
||||||
tristate "BT8xx based PCI cards"
|
tristate "BT8xx based PCI cards"
|
||||||
depends on DVB_CORE && PCI && I2C && VIDEO_BT848
|
depends on DVB_CORE && PCI && I2C && VIDEO_BT848
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select DVB_MT352 if !DVB_FE_CUSTOMISE
|
select DVB_MT352 if !DVB_FE_CUSTOMISE
|
||||||
select DVB_SP887X if !DVB_FE_CUSTOMISE
|
select DVB_SP887X if !DVB_FE_CUSTOMISE
|
||||||
select DVB_NXT6000 if !DVB_FE_CUSTOMISE
|
select DVB_NXT6000 if !DVB_FE_CUSTOMISE
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config DVB_USB
|
config DVB_USB
|
||||||
tristate "Support for various USB DVB devices"
|
tristate "Support for various USB DVB devices"
|
||||||
depends on DVB_CORE && USB && I2C
|
depends on DVB_CORE && USB && I2C
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
By enabling this you will be able to choose the various supported
|
By enabling this you will be able to choose the various supported
|
||||||
|
|
|
@ -97,7 +97,7 @@ comment "DVB-T (terrestrial) frontends"
|
||||||
|
|
||||||
config DVB_SP8870
|
config DVB_SP8870
|
||||||
tristate "Spase sp8870 based"
|
tristate "Spase sp8870 based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -110,7 +110,7 @@ config DVB_SP8870
|
||||||
|
|
||||||
config DVB_SP887X
|
config DVB_SP887X
|
||||||
tristate "Spase sp887x based"
|
tristate "Spase sp887x based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -144,7 +144,7 @@ config DVB_L64781
|
||||||
|
|
||||||
config DVB_TDA1004X
|
config DVB_TDA1004X
|
||||||
tristate "Philips TDA10045H/TDA10046H based"
|
tristate "Philips TDA10045H/TDA10046H based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -211,7 +211,7 @@ config DVB_DIB7000P
|
||||||
|
|
||||||
config DVB_TDA10048
|
config DVB_TDA10048
|
||||||
tristate "Philips TDA10048HN based"
|
tristate "Philips TDA10048HN based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -253,7 +253,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
|
||||||
|
|
||||||
config DVB_NXT200X
|
config DVB_NXT200X
|
||||||
tristate "NxtWave Communications NXT2002/NXT2004 based"
|
tristate "NxtWave Communications NXT2002/NXT2004 based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -268,7 +268,7 @@ config DVB_NXT200X
|
||||||
|
|
||||||
config DVB_OR51211
|
config DVB_OR51211
|
||||||
tristate "Oren OR51211 based"
|
tristate "Oren OR51211 based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -281,7 +281,7 @@ config DVB_OR51211
|
||||||
|
|
||||||
config DVB_OR51132
|
config DVB_OR51132
|
||||||
tristate "Oren OR51132 based"
|
tristate "Oren OR51132 based"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
@ -297,7 +297,7 @@ config DVB_OR51132
|
||||||
|
|
||||||
config DVB_BCM3510
|
config DVB_BCM3510
|
||||||
tristate "Broadcom BCM3510"
|
tristate "Broadcom BCM3510"
|
||||||
depends on DVB_CORE && I2C
|
depends on DVB_CORE && I2C && HOTPLUG
|
||||||
default m if DVB_FE_CUSTOMISE
|
default m if DVB_FE_CUSTOMISE
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
help
|
help
|
||||||
|
|
|
@ -5,6 +5,7 @@ config TTPCI_EEPROM
|
||||||
config DVB_AV7110
|
config DVB_AV7110
|
||||||
tristate "AV7110 cards"
|
tristate "AV7110 cards"
|
||||||
depends on DVB_CORE && PCI && I2C
|
depends on DVB_CORE && PCI && I2C
|
||||||
|
depends on HOTPLUG
|
||||||
select FW_LOADER if !DVB_AV7110_FIRMWARE
|
select FW_LOADER if !DVB_AV7110_FIRMWARE
|
||||||
select TTPCI_EEPROM
|
select TTPCI_EEPROM
|
||||||
select VIDEO_SAA7146_VV
|
select VIDEO_SAA7146_VV
|
||||||
|
@ -123,6 +124,7 @@ config DVB_BUDGET_AV
|
||||||
depends on DVB_BUDGET_CORE && I2C
|
depends on DVB_BUDGET_CORE && I2C
|
||||||
select VIDEO_SAA7146_VV
|
select VIDEO_SAA7146_VV
|
||||||
depends on VIDEO_DEV # dependencies of 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_PLL if !DVB_FE_CUSTOMISE
|
||||||
select DVB_STV0299 if !DVB_FE_CUSTOMISE
|
select DVB_STV0299 if !DVB_FE_CUSTOMISE
|
||||||
select DVB_TDA1004X if !DVB_FE_CUSTOMISE
|
select DVB_TDA1004X if !DVB_FE_CUSTOMISE
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config DVB_TTUSB_DEC
|
config DVB_TTUSB_DEC
|
||||||
tristate "Technotrend/Hauppauge USB DEC devices"
|
tristate "Technotrend/Hauppauge USB DEC devices"
|
||||||
depends on DVB_CORE && USB
|
depends on DVB_CORE && USB
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select CRC32
|
select CRC32
|
||||||
help
|
help
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config VIDEO_BT848
|
config VIDEO_BT848
|
||||||
tristate "BT848 Video For Linux"
|
tristate "BT848 Video For Linux"
|
||||||
depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
|
depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_BTCX
|
select VIDEO_BTCX
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
config VIDEO_CX18
|
config VIDEO_CX18
|
||||||
tristate "Conexant cx23418 MPEG encoder support"
|
tristate "Conexant cx23418 MPEG encoder support"
|
||||||
depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
|
depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
|
||||||
|
depends on INPUT # due to VIDEO_IR
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_IR
|
select VIDEO_IR
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config VIDEO_CX23885
|
config VIDEO_CX23885
|
||||||
tristate "Conexant cx23885 (2388x successor) support"
|
tristate "Conexant cx23885 (2388x successor) support"
|
||||||
depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
|
depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_BTCX
|
select VIDEO_BTCX
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config VIDEO_CX25840
|
config VIDEO_CX25840
|
||||||
tristate "Conexant CX2584x audio/video decoders"
|
tristate "Conexant CX2584x audio/video decoders"
|
||||||
depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
|
depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
---help---
|
---help---
|
||||||
Support for the Conexant CX2584x audio/video decoders.
|
Support for the Conexant CX2584x audio/video decoders.
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
config VIDEO_IVTV
|
config VIDEO_IVTV
|
||||||
tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
|
tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
|
||||||
depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
|
depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
|
||||||
|
depends on INPUT # due to VIDEO_IR
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_IR
|
select VIDEO_IR
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config VIDEO_PVRUSB2
|
config VIDEO_PVRUSB2
|
||||||
tristate "Hauppauge WinTV-PVR USB2 support"
|
tristate "Hauppauge WinTV-PVR USB2 support"
|
||||||
depends on VIDEO_V4L2 && I2C
|
depends on VIDEO_V4L2 && I2C
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_TUNER
|
select VIDEO_TUNER
|
||||||
select VIDEO_TVEEPROM
|
select VIDEO_TVEEPROM
|
||||||
|
|
|
@ -27,6 +27,7 @@ config VIDEO_SAA7134_ALSA
|
||||||
config VIDEO_SAA7134_DVB
|
config VIDEO_SAA7134_DVB
|
||||||
tristate "DVB/ATSC Support for saa7134 based TV cards"
|
tristate "DVB/ATSC Support for saa7134 based TV cards"
|
||||||
depends on VIDEO_SAA7134 && DVB_CORE
|
depends on VIDEO_SAA7134 && DVB_CORE
|
||||||
|
depends on HOTPLUG # due to FW_LOADER
|
||||||
select VIDEOBUF_DVB
|
select VIDEOBUF_DVB
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select DVB_PLL if !DVB_FE_CUSTOMISE
|
select DVB_PLL if !DVB_FE_CUSTOMISE
|
||||||
|
|
Loading…
Reference in a new issue