diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-27 09:04:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:24:37 -0400 |
commit | 445c2714cf72817ab1ad3ca894c6d9b2047b3a3e (patch) | |
tree | 812b3156f9649c0f08506058037dbb7aad00fa5b | |
parent | 9fa0f6db3a201bef49f28e69f80802559a38586b (diff) |
V4L/DVB (8534): remove select's of FW_LOADER
After commit d9b19199e4894089456aaad295023263b5225c1a
(always enable FW_LOADER unless EMBEDDED=y) we can remove
the FW_LOADER select's and corresponding dependencies
on HOTPLUG.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/common/tuners/Kconfig | 9 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 24 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ttusb-dec/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx18/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx23885/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx25840/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/video/ivtv/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/Kconfig | 2 |
14 files changed, 11 insertions, 49 deletions
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig index 8d93ba857361..6f92beaa5ac8 100644 --- a/drivers/media/common/tuners/Kconfig +++ b/drivers/media/common/tuners/Kconfig | |||
@@ -21,9 +21,8 @@ config MEDIA_TUNER | |||
21 | tristate | 21 | tristate |
22 | default VIDEO_MEDIA && I2C | 22 | default VIDEO_MEDIA && I2C |
23 | depends on VIDEO_MEDIA && I2C | 23 | depends on VIDEO_MEDIA && I2C |
24 | select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG | 24 | select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE |
25 | select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG | 25 | select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE |
26 | select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG | ||
27 | select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE | 26 | select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE |
28 | select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE | 27 | select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE |
29 | select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE | 28 | select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE |
@@ -138,8 +137,6 @@ config MEDIA_TUNER_QT1010 | |||
138 | config MEDIA_TUNER_XC2028 | 137 | config MEDIA_TUNER_XC2028 |
139 | tristate "XCeive xc2028/xc3028 tuners" | 138 | tristate "XCeive xc2028/xc3028 tuners" |
140 | depends on VIDEO_MEDIA && I2C | 139 | depends on VIDEO_MEDIA && I2C |
141 | depends on HOTPLUG | ||
142 | select FW_LOADER | ||
143 | default m if MEDIA_TUNER_CUSTOMIZE | 140 | default m if MEDIA_TUNER_CUSTOMIZE |
144 | help | 141 | help |
145 | Say Y here to include support for the xc2028/xc3028 tuners. | 142 | Say Y here to include support for the xc2028/xc3028 tuners. |
@@ -147,8 +144,6 @@ config MEDIA_TUNER_XC2028 | |||
147 | config MEDIA_TUNER_XC5000 | 144 | config MEDIA_TUNER_XC5000 |
148 | tristate "Xceive XC5000 silicon tuner" | 145 | tristate "Xceive XC5000 silicon tuner" |
149 | depends on VIDEO_MEDIA && I2C | 146 | depends on VIDEO_MEDIA && I2C |
150 | depends on HOTPLUG | ||
151 | select FW_LOADER | ||
152 | default m if DVB_FE_CUSTOMISE | 147 | default m if DVB_FE_CUSTOMISE |
153 | help | 148 | help |
154 | A driver for the silicon tuner XC5000 from Xceive. | 149 | A driver for the silicon tuner XC5000 from Xceive. |
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig index 7588db1319d0..7e9c090fc04e 100644 --- a/drivers/media/dvb/bt8xx/Kconfig +++ b/drivers/media/dvb/bt8xx/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config DVB_BT8XX | 1 | config DVB_BT8XX |
2 | tristate "BT8xx based PCI cards" | 2 | tristate "BT8xx based PCI cards" |
3 | depends on DVB_CORE && PCI && I2C && VIDEO_BT848 | 3 | depends on DVB_CORE && PCI && I2C && VIDEO_BT848 |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select DVB_MT352 if !DVB_FE_CUSTOMISE | 4 | select DVB_MT352 if !DVB_FE_CUSTOMISE |
6 | select DVB_SP887X if !DVB_FE_CUSTOMISE | 5 | select DVB_SP887X if !DVB_FE_CUSTOMISE |
7 | select DVB_NXT6000 if !DVB_FE_CUSTOMISE | 6 | select DVB_NXT6000 if !DVB_FE_CUSTOMISE |
@@ -10,7 +9,6 @@ config DVB_BT8XX | |||
10 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE | 9 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE |
11 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE | 10 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE |
12 | select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE | 11 | select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE |
13 | select FW_LOADER | ||
14 | help | 12 | help |
15 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are | 13 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are |
16 | the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards, | 14 | the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards, |
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index 3c663c65ef66..e84152b7576d 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig | |||
@@ -1,8 +1,6 @@ | |||
1 | config DVB_USB | 1 | config DVB_USB |
2 | tristate "Support for various USB DVB devices" | 2 | tristate "Support for various USB DVB devices" |
3 | depends on DVB_CORE && USB && I2C && INPUT | 3 | depends on DVB_CORE && USB && I2C && INPUT |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select FW_LOADER | ||
6 | help | 4 | help |
7 | By enabling this you will be able to choose the various supported | 5 | By enabling this you will be able to choose the various supported |
8 | USB1.1 and USB2.0 DVB devices. | 6 | USB1.1 and USB2.0 DVB devices. |
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index fa7f0c563770..574dffe91b68 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig | |||
@@ -97,9 +97,8 @@ comment "DVB-T (terrestrial) frontends" | |||
97 | 97 | ||
98 | config DVB_SP8870 | 98 | config DVB_SP8870 |
99 | tristate "Spase sp8870 based" | 99 | tristate "Spase sp8870 based" |
100 | depends on DVB_CORE && I2C && HOTPLUG | 100 | depends on DVB_CORE && I2C |
101 | default m if DVB_FE_CUSTOMISE | 101 | default m if DVB_FE_CUSTOMISE |
102 | select FW_LOADER | ||
103 | help | 102 | help |
104 | A DVB-T tuner module. Say Y when you want to support this frontend. | 103 | A DVB-T tuner module. Say Y when you want to support this frontend. |
105 | 104 | ||
@@ -110,9 +109,8 @@ config DVB_SP8870 | |||
110 | 109 | ||
111 | config DVB_SP887X | 110 | config DVB_SP887X |
112 | tristate "Spase sp887x based" | 111 | tristate "Spase sp887x based" |
113 | depends on DVB_CORE && I2C && HOTPLUG | 112 | depends on DVB_CORE && I2C |
114 | default m if DVB_FE_CUSTOMISE | 113 | default m if DVB_FE_CUSTOMISE |
115 | select FW_LOADER | ||
116 | help | 114 | help |
117 | A DVB-T tuner module. Say Y when you want to support this frontend. | 115 | A DVB-T tuner module. Say Y when you want to support this frontend. |
118 | 116 | ||
@@ -158,9 +156,8 @@ config DVB_L64781 | |||
158 | 156 | ||
159 | config DVB_TDA1004X | 157 | config DVB_TDA1004X |
160 | tristate "Philips TDA10045H/TDA10046H based" | 158 | tristate "Philips TDA10045H/TDA10046H based" |
161 | depends on DVB_CORE && I2C && HOTPLUG | 159 | depends on DVB_CORE && I2C |
162 | default m if DVB_FE_CUSTOMISE | 160 | default m if DVB_FE_CUSTOMISE |
163 | select FW_LOADER | ||
164 | help | 161 | help |
165 | A DVB-T tuner module. Say Y when you want to support this frontend. | 162 | A DVB-T tuner module. Say Y when you want to support this frontend. |
166 | 163 | ||
@@ -225,9 +222,8 @@ config DVB_DIB7000P | |||
225 | 222 | ||
226 | config DVB_TDA10048 | 223 | config DVB_TDA10048 |
227 | tristate "Philips TDA10048HN based" | 224 | tristate "Philips TDA10048HN based" |
228 | depends on DVB_CORE && I2C && HOTPLUG | 225 | depends on DVB_CORE && I2C |
229 | default m if DVB_FE_CUSTOMISE | 226 | default m if DVB_FE_CUSTOMISE |
230 | select FW_LOADER | ||
231 | help | 227 | help |
232 | A DVB-T tuner module. Say Y when you want to support this frontend. | 228 | A DVB-T tuner module. Say Y when you want to support this frontend. |
233 | 229 | ||
@@ -267,9 +263,8 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends" | |||
267 | 263 | ||
268 | config DVB_NXT200X | 264 | config DVB_NXT200X |
269 | tristate "NxtWave Communications NXT2002/NXT2004 based" | 265 | tristate "NxtWave Communications NXT2002/NXT2004 based" |
270 | depends on DVB_CORE && I2C && HOTPLUG | 266 | depends on DVB_CORE && I2C |
271 | default m if DVB_FE_CUSTOMISE | 267 | default m if DVB_FE_CUSTOMISE |
272 | select FW_LOADER | ||
273 | help | 268 | help |
274 | An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want | 269 | An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want |
275 | to support this frontend. | 270 | to support this frontend. |
@@ -282,9 +277,8 @@ config DVB_NXT200X | |||
282 | 277 | ||
283 | config DVB_OR51211 | 278 | config DVB_OR51211 |
284 | tristate "Oren OR51211 based" | 279 | tristate "Oren OR51211 based" |
285 | depends on DVB_CORE && I2C && HOTPLUG | 280 | depends on DVB_CORE && I2C |
286 | default m if DVB_FE_CUSTOMISE | 281 | default m if DVB_FE_CUSTOMISE |
287 | select FW_LOADER | ||
288 | help | 282 | help |
289 | An ATSC 8VSB tuner module. Say Y when you want to support this frontend. | 283 | An ATSC 8VSB tuner module. Say Y when you want to support this frontend. |
290 | 284 | ||
@@ -295,9 +289,8 @@ config DVB_OR51211 | |||
295 | 289 | ||
296 | config DVB_OR51132 | 290 | config DVB_OR51132 |
297 | tristate "Oren OR51132 based" | 291 | tristate "Oren OR51132 based" |
298 | depends on DVB_CORE && I2C && HOTPLUG | 292 | depends on DVB_CORE && I2C |
299 | default m if DVB_FE_CUSTOMISE | 293 | default m if DVB_FE_CUSTOMISE |
300 | select FW_LOADER | ||
301 | help | 294 | help |
302 | An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want | 295 | An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want |
303 | to support this frontend. | 296 | to support this frontend. |
@@ -311,9 +304,8 @@ config DVB_OR51132 | |||
311 | 304 | ||
312 | config DVB_BCM3510 | 305 | config DVB_BCM3510 |
313 | tristate "Broadcom BCM3510" | 306 | tristate "Broadcom BCM3510" |
314 | depends on DVB_CORE && I2C && HOTPLUG | 307 | depends on DVB_CORE && I2C |
315 | default m if DVB_FE_CUSTOMISE | 308 | default m if DVB_FE_CUSTOMISE |
316 | select FW_LOADER | ||
317 | help | 309 | help |
318 | An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to | 310 | An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to |
319 | support this frontend. | 311 | support this frontend. |
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index 87c973ac668b..41b5a988b619 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
@@ -5,8 +5,6 @@ config TTPCI_EEPROM | |||
5 | config DVB_AV7110 | 5 | config DVB_AV7110 |
6 | tristate "AV7110 cards" | 6 | tristate "AV7110 cards" |
7 | depends on DVB_CORE && PCI && I2C | 7 | depends on DVB_CORE && PCI && I2C |
8 | depends on HOTPLUG | ||
9 | select FW_LOADER if !DVB_AV7110_FIRMWARE | ||
10 | select TTPCI_EEPROM | 8 | select TTPCI_EEPROM |
11 | select VIDEO_SAA7146_VV | 9 | select VIDEO_SAA7146_VV |
12 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 10 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
@@ -127,14 +125,12 @@ config DVB_BUDGET_AV | |||
127 | depends on DVB_BUDGET_CORE && I2C | 125 | depends on DVB_BUDGET_CORE && I2C |
128 | select VIDEO_SAA7146_VV | 126 | select VIDEO_SAA7146_VV |
129 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 127 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
130 | depends on HOTPLUG # dependency of FW_LOADER | ||
131 | select DVB_PLL if !DVB_FE_CUSTOMISE | 128 | select DVB_PLL if !DVB_FE_CUSTOMISE |
132 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 129 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
133 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 130 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |
134 | select DVB_TDA10021 if !DVB_FE_CUSTOMISE | 131 | select DVB_TDA10021 if !DVB_FE_CUSTOMISE |
135 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE | 132 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE |
136 | select DVB_TUA6100 if !DVB_FE_CUSTOMISE | 133 | select DVB_TUA6100 if !DVB_FE_CUSTOMISE |
137 | select FW_LOADER | ||
138 | help | 134 | help |
139 | Support for simple SAA7146 based DVB cards | 135 | Support for simple SAA7146 based DVB cards |
140 | (so called Budget- or Nova-PCI cards) without onboard | 136 | (so called Budget- or Nova-PCI cards) without onboard |
diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/dvb/ttusb-dec/Kconfig index a23cc0aa17d3..d5f48a3102bd 100644 --- a/drivers/media/dvb/ttusb-dec/Kconfig +++ b/drivers/media/dvb/ttusb-dec/Kconfig | |||
@@ -1,8 +1,6 @@ | |||
1 | config DVB_TTUSB_DEC | 1 | config DVB_TTUSB_DEC |
2 | tristate "Technotrend/Hauppauge USB DEC devices" | 2 | tristate "Technotrend/Hauppauge USB DEC devices" |
3 | depends on DVB_CORE && USB && INPUT | 3 | depends on DVB_CORE && USB && INPUT |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select FW_LOADER | ||
6 | select CRC32 | 4 | select CRC32 |
7 | help | 5 | help |
8 | Support for external USB adapters designed by Technotrend and | 6 | Support for external USB adapters designed by Technotrend and |
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig index 24a34fc1f2b3..ce71e8e7b835 100644 --- a/drivers/media/video/bt8xx/Kconfig +++ b/drivers/media/video/bt8xx/Kconfig | |||
@@ -1,9 +1,7 @@ | |||
1 | config VIDEO_BT848 | 1 | config VIDEO_BT848 |
2 | tristate "BT848 Video For Linux" | 2 | tristate "BT848 Video For Linux" |
3 | depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT | 3 | depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
6 | select FW_LOADER | ||
7 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
8 | select VIDEOBUF_DMA_SG | 6 | select VIDEOBUF_DMA_SG |
9 | select VIDEO_IR | 7 | select VIDEO_IR |
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index 9aefdc5ea79a..ef48565de7f1 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
@@ -2,9 +2,7 @@ config VIDEO_CX18 | |||
2 | tristate "Conexant cx23418 MPEG encoder support" | 2 | tristate "Conexant cx23418 MPEG encoder support" |
3 | depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL | 3 | depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL |
4 | depends on INPUT # due to VIDEO_IR | 4 | depends on INPUT # due to VIDEO_IR |
5 | depends on HOTPLUG # due to FW_LOADER | ||
6 | select I2C_ALGOBIT | 5 | select I2C_ALGOBIT |
7 | select FW_LOADER | ||
8 | select VIDEO_IR | 6 | select VIDEO_IR |
9 | select VIDEO_TUNER | 7 | select VIDEO_TUNER |
10 | select VIDEO_TVEEPROM | 8 | select VIDEO_TVEEPROM |
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index 5cfb46bbdaa9..e60bd31b51a3 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig | |||
@@ -1,9 +1,7 @@ | |||
1 | config VIDEO_CX23885 | 1 | config VIDEO_CX23885 |
2 | tristate "Conexant cx23885 (2388x successor) support" | 2 | tristate "Conexant cx23885 (2388x successor) support" |
3 | depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT | 3 | depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
6 | select FW_LOADER | ||
7 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
8 | select VIDEO_TUNER | 6 | select VIDEO_TUNER |
9 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig index 448f4cd0ce34..de515dadadc2 100644 --- a/drivers/media/video/cx25840/Kconfig +++ b/drivers/media/video/cx25840/Kconfig | |||
@@ -1,8 +1,6 @@ | |||
1 | config VIDEO_CX25840 | 1 | config VIDEO_CX25840 |
2 | tristate "Conexant CX2584x audio/video decoders" | 2 | tristate "Conexant CX2584x audio/video decoders" |
3 | depends on VIDEO_V4L2 && I2C && EXPERIMENTAL | 3 | depends on VIDEO_V4L2 && I2C && EXPERIMENTAL |
4 | depends on HOTPLUG # due to FW_LOADER | ||
5 | select FW_LOADER | ||
6 | ---help--- | 4 | ---help--- |
7 | Support for the Conexant CX2584x audio/video decoders. | 5 | Support for the Conexant CX2584x audio/video decoders. |
8 | 6 | ||
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 10e20d8196dc..9dd7bdf659b9 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
@@ -33,9 +33,8 @@ config VIDEO_CX88_ALSA | |||
33 | 33 | ||
34 | config VIDEO_CX88_BLACKBIRD | 34 | config VIDEO_CX88_BLACKBIRD |
35 | tristate "Blackbird MPEG encoder support (cx2388x + cx23416)" | 35 | tristate "Blackbird MPEG encoder support (cx2388x + cx23416)" |
36 | depends on VIDEO_CX88 && HOTPLUG | 36 | depends on VIDEO_CX88 |
37 | select VIDEO_CX2341X | 37 | select VIDEO_CX2341X |
38 | select FW_LOADER | ||
39 | ---help--- | 38 | ---help--- |
40 | This adds support for MPEG encoder cards based on the | 39 | This adds support for MPEG encoder cards based on the |
41 | Blackbird reference design, using the Conexant 2388x | 40 | Blackbird reference design, using the Conexant 2388x |
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig index 5d7ee8fcdd50..0069898bddab 100644 --- a/drivers/media/video/ivtv/Kconfig +++ b/drivers/media/video/ivtv/Kconfig | |||
@@ -2,9 +2,7 @@ config VIDEO_IVTV | |||
2 | tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" | 2 | tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" |
3 | depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL | 3 | depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL |
4 | depends on INPUT # due to VIDEO_IR | 4 | depends on INPUT # due to VIDEO_IR |
5 | depends on HOTPLUG # due to FW_LOADER | ||
6 | select I2C_ALGOBIT | 5 | select I2C_ALGOBIT |
7 | select FW_LOADER | ||
8 | select VIDEO_IR | 6 | select VIDEO_IR |
9 | select VIDEO_TUNER | 7 | select VIDEO_TUNER |
10 | select VIDEO_TVEEPROM | 8 | select VIDEO_TVEEPROM |
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig index 4482b2c72ced..19eb274c9cd0 100644 --- a/drivers/media/video/pvrusb2/Kconfig +++ b/drivers/media/video/pvrusb2/Kconfig | |||
@@ -2,8 +2,6 @@ config VIDEO_PVRUSB2 | |||
2 | tristate "Hauppauge WinTV-PVR USB2 support" | 2 | tristate "Hauppauge WinTV-PVR USB2 support" |
3 | depends on VIDEO_V4L2 && I2C | 3 | depends on VIDEO_V4L2 && I2C |
4 | depends on VIDEO_MEDIA # Avoids pvrusb = Y / DVB = M | 4 | depends on VIDEO_MEDIA # Avoids pvrusb = Y / DVB = M |
5 | depends on HOTPLUG # due to FW_LOADER | ||
6 | select FW_LOADER | ||
7 | select VIDEO_TUNER | 5 | select VIDEO_TUNER |
8 | select VIDEO_TVEEPROM | 6 | select VIDEO_TVEEPROM |
9 | select VIDEO_CX2341X | 7 | select VIDEO_CX2341X |
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 83f076abce35..7021bbf5897b 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
@@ -27,9 +27,7 @@ config VIDEO_SAA7134_ALSA | |||
27 | config VIDEO_SAA7134_DVB | 27 | config VIDEO_SAA7134_DVB |
28 | tristate "DVB/ATSC Support for saa7134 based TV cards" | 28 | tristate "DVB/ATSC Support for saa7134 based TV cards" |
29 | depends on VIDEO_SAA7134 && DVB_CORE | 29 | depends on VIDEO_SAA7134 && DVB_CORE |
30 | depends on HOTPLUG # due to FW_LOADER | ||
31 | select VIDEOBUF_DVB | 30 | select VIDEOBUF_DVB |
32 | select FW_LOADER | ||
33 | select DVB_PLL if !DVB_FE_CUSTOMISE | 31 | select DVB_PLL if !DVB_FE_CUSTOMISE |
34 | select DVB_MT352 if !DVB_FE_CUSTOMISE | 32 | select DVB_MT352 if !DVB_FE_CUSTOMISE |
35 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 33 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |