diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-22 14:38:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:33 -0400 |
commit | fe9b5bb5e57a92df74bd7bc6a79a04671a65dddd (patch) | |
tree | a9a17499d1c2342a2ceba66d3377455fdd088728 /drivers | |
parent | 6e40773a9b8fe196720b913cff31a346a39483e2 (diff) |
V4L/DVB (4516): Split audio/video encoders/decoders from main drivers
Several audio/video encoders/decoders were just bound as if they were
part of the core driver.
In fact, they are generic enough to be used by other drivers as well,
since they use I2C event bus to communicate.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/Kconfig | 17 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 37 |
2 files changed, 31 insertions, 23 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 31a564655bda..a2fda43e8075 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -135,7 +135,7 @@ source "drivers/media/video/cpia2/Kconfig" | |||
135 | 135 | ||
136 | config VIDEO_SAA5246A | 136 | config VIDEO_SAA5246A |
137 | tristate "SAA5246A, SAA5281 Teletext processor" | 137 | tristate "SAA5246A, SAA5281 Teletext processor" |
138 | depends on I2C && VIDEO_V4L1 | 138 | depends on I2C && VIDEO_V4L2 |
139 | help | 139 | help |
140 | Support for I2C bus based teletext using the SAA5246A or SAA5281 | 140 | Support for I2C bus based teletext using the SAA5246A or SAA5281 |
141 | chip. Useful only if you live in Europe. | 141 | chip. Useful only if you live in Europe. |
@@ -145,7 +145,7 @@ config VIDEO_SAA5246A | |||
145 | 145 | ||
146 | config VIDEO_SAA5249 | 146 | config VIDEO_SAA5249 |
147 | tristate "SAA5249 Teletext processor" | 147 | tristate "SAA5249 Teletext processor" |
148 | depends on VIDEO_DEV && I2C && VIDEO_V4L1 | 148 | depends on VIDEO_DEV && I2C && VIDEO_V4L2 |
149 | help | 149 | help |
150 | Support for I2C bus based teletext using the SAA5249 chip. At the | 150 | Support for I2C bus based teletext using the SAA5249 chip. At the |
151 | moment this is only useful on some European WinTV cards. | 151 | moment this is only useful on some European WinTV cards. |
@@ -162,7 +162,7 @@ config TUNER_3036 | |||
162 | 162 | ||
163 | config VIDEO_VINO | 163 | config VIDEO_VINO |
164 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" | 164 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" |
165 | depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L1 | 165 | depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 |
166 | select I2C_ALGO_SGI | 166 | select I2C_ALGO_SGI |
167 | help | 167 | help |
168 | Say Y here to build in support for the Vino video input system found | 168 | Say Y here to build in support for the Vino video input system found |
@@ -260,7 +260,7 @@ source "drivers/media/video/saa7134/Kconfig" | |||
260 | 260 | ||
261 | config VIDEO_MXB | 261 | config VIDEO_MXB |
262 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" | 262 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" |
263 | depends on PCI && VIDEO_V4L1 && I2C | 263 | depends on PCI && VIDEO_V4L1 |
264 | select VIDEO_SAA7146_VV | 264 | select VIDEO_SAA7146_VV |
265 | select VIDEO_TUNER | 265 | select VIDEO_TUNER |
266 | ---help--- | 266 | ---help--- |
@@ -272,9 +272,8 @@ config VIDEO_MXB | |||
272 | 272 | ||
273 | config VIDEO_DPC | 273 | config VIDEO_DPC |
274 | tristate "Philips-Semiconductors 'dpc7146 demonstration board'" | 274 | tristate "Philips-Semiconductors 'dpc7146 demonstration board'" |
275 | depends on PCI && VIDEO_V4L1 && I2C | 275 | depends on PCI && VIDEO_V4L1 |
276 | select VIDEO_SAA7146_VV | 276 | select VIDEO_SAA7146_VV |
277 | select VIDEO_V4L2 | ||
278 | ---help--- | 277 | ---help--- |
279 | This is a video4linux driver for the 'dpc7146 demonstration | 278 | This is a video4linux driver for the 'dpc7146 demonstration |
280 | board' by Philips-Semiconductors. It's the reference design | 279 | board' by Philips-Semiconductors. It's the reference design |
@@ -287,9 +286,8 @@ config VIDEO_DPC | |||
287 | 286 | ||
288 | config VIDEO_HEXIUM_ORION | 287 | config VIDEO_HEXIUM_ORION |
289 | tristate "Hexium HV-PCI6 and Orion frame grabber" | 288 | tristate "Hexium HV-PCI6 and Orion frame grabber" |
290 | depends on PCI && VIDEO_V4L1 && I2C | 289 | depends on PCI && VIDEO_V4L2 |
291 | select VIDEO_SAA7146_VV | 290 | select VIDEO_SAA7146_VV |
292 | select VIDEO_V4L2 | ||
293 | ---help--- | 291 | ---help--- |
294 | This is a video4linux driver for the Hexium HV-PCI6 and | 292 | This is a video4linux driver for the Hexium HV-PCI6 and |
295 | Orion frame grabber cards by Hexium. | 293 | Orion frame grabber cards by Hexium. |
@@ -299,9 +297,8 @@ config VIDEO_HEXIUM_ORION | |||
299 | 297 | ||
300 | config VIDEO_HEXIUM_GEMINI | 298 | config VIDEO_HEXIUM_GEMINI |
301 | tristate "Hexium Gemini frame grabber" | 299 | tristate "Hexium Gemini frame grabber" |
302 | depends on PCI && VIDEO_V4L1 && I2C | 300 | depends on PCI && VIDEO_V4L2 |
303 | select VIDEO_SAA7146_VV | 301 | select VIDEO_SAA7146_VV |
304 | select VIDEO_V4L2 | ||
305 | ---help--- | 302 | ---help--- |
306 | This is a video4linux driver for the Hexium Gemini frame | 303 | This is a video4linux driver for the Hexium Gemini frame |
307 | grabber card by Hexium. Please note that the Gemini Dual | 304 | grabber card by Hexium. Please note that the Gemini Dual |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index d2753d10745d..eecbede6c4b4 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -30,17 +30,31 @@ obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o | |||
30 | obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o | 30 | obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o |
31 | obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o | 31 | obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o |
32 | obj-$(CONFIG_VIDEO_W9966) += w9966.o | 32 | obj-$(CONFIG_VIDEO_W9966) += w9966.o |
33 | obj-$(CONFIG_VIDEO_ZORAN_BUZ) += saa7111.o saa7185.o zr36060.o | 33 | |
34 | obj-$(CONFIG_VIDEO_ZORAN_DC10) += saa7110.o adv7175.o zr36060.o | 34 | obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o |
35 | obj-$(CONFIG_VIDEO_ZORAN_DC30) += adv7175.o vpx3220.o zr36050.o \ | 35 | obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o |
36 | zr36016.o | 36 | obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o |
37 | obj-$(CONFIG_VIDEO_ZORAN_LML33) += bt819.o bt856.o zr36060.o | 37 | obj-$(CONFIG_VIDEO_SAA7110) += saa7110.o |
38 | obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o | 38 | obj-$(CONFIG_VIDEO_SAA7111) += saa7111.o |
39 | obj-$(CONFIG_VIDEO_ZORAN_AVS6EYES) += bt866.o ks0127.o zr36060.o | 39 | obj-$(CONFIG_VIDEO_SAA7114) += saa7114.o |
40 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o | ||
41 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o | ||
42 | obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o | ||
43 | obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o | ||
44 | obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o | ||
45 | obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o | ||
46 | obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o | ||
47 | obj-$(CONFIG_VIDEO_BT819) += bt819.o | ||
48 | obj-$(CONFIG_VIDEO_BT856) += bt856.o | ||
49 | obj-$(CONFIG_VIDEO_BT866) += bt866.o | ||
50 | |||
40 | obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o | 51 | obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o |
52 | obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o | ||
53 | obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o | ||
54 | |||
41 | obj-$(CONFIG_VIDEO_PMS) += pms.o | 55 | obj-$(CONFIG_VIDEO_PMS) += pms.o |
42 | obj-$(CONFIG_VIDEO_PLANB) += planb.o | 56 | obj-$(CONFIG_VIDEO_PLANB) += planb.o |
43 | obj-$(CONFIG_VIDEO_VINO) += vino.o saa7191.o indycam.o | 57 | obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o |
44 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o | 58 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o |
45 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o | 59 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o |
46 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o | 60 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o |
@@ -58,10 +72,10 @@ obj-$(CONFIG_VIDEO_WM8775) += wm8775.o | |||
58 | obj-$(CONFIG_VIDEO_WM8739) += wm8739.o | 72 | obj-$(CONFIG_VIDEO_WM8739) += wm8739.o |
59 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ | 73 | obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ |
60 | obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ | 74 | obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ |
61 | obj-$(CONFIG_VIDEO_MXB) += saa7111.o tda9840.o tea6415c.o tea6420.o mxb.o | 75 | obj-$(CONFIG_VIDEO_MXB) += mxb.o |
62 | obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o | 76 | obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o |
63 | obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o | 77 | obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o |
64 | obj-$(CONFIG_VIDEO_DPC) += saa7111.o dpc7146.o | 78 | obj-$(CONFIG_VIDEO_DPC) += dpc7146.o |
65 | obj-$(CONFIG_TUNER_3036) += tuner-3036.o | 79 | obj-$(CONFIG_TUNER_3036) += tuner-3036.o |
66 | 80 | ||
67 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o | 81 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o |
@@ -73,8 +87,6 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o | |||
73 | obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o | 87 | obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o |
74 | 88 | ||
75 | obj-$(CONFIG_VIDEO_CX25840) += cx25840/ | 89 | obj-$(CONFIG_VIDEO_CX25840) += cx25840/ |
76 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o | ||
77 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o | ||
78 | obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o | 90 | obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o |
79 | obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o | 91 | obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o |
80 | obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o | 92 | obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o |
@@ -99,4 +111,3 @@ obj-$(CONFIG_VIDEO_VIVI) += vivi.o | |||
99 | 111 | ||
100 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 112 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
101 | extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT | 113 | extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT |
102 | |||