diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 14:43:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-12 18:54:53 -0400 |
commit | cd41e28e2d0f198ad56840bf8ba13cb41b129bab (patch) | |
tree | a11b7e23c14625a4b019b43eecdc8fff2ee62463 /drivers/media/video | |
parent | ea76ce526ec1af3e07f3dd9107ca93f0c82fc9c9 (diff) |
V4L/DVB (3774): Create V4L1 config options
V4L1 API is depreciated and should be removed soon from kernel. This patch
adds two new options, one to disable V4L1 drivers, and another to disable
V4L1 compat module. This way, it would be easy to check what still depends
on V4L1 stuff, allowing also to test if app works fine with V4L2 only support.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/Kconfig | 67 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 3 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/et61x251/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/pwc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/Kconfig | 6 | ||||
-rw-r--r-- | drivers/media/video/vivi.c | 4 | ||||
-rw-r--r-- | drivers/media/video/zc0301/Kconfig | 2 |
12 files changed, 54 insertions, 42 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 85888a8a93c9..bff9d8f51dab 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -2,10 +2,10 @@ | |||
2 | # Multimedia Video device configuration | 2 | # Multimedia Video device configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Video For Linux" | 5 | menu "Video Capture Adapters" |
6 | depends on VIDEO_DEV | 6 | depends on VIDEO_DEV |
7 | 7 | ||
8 | comment "Video Adapters" | 8 | comment "Video Capture Adapters" |
9 | 9 | ||
10 | config VIDEO_ADV_DEBUG | 10 | config VIDEO_ADV_DEBUG |
11 | bool "Enable advanced debug functionality" | 11 | bool "Enable advanced debug functionality" |
@@ -20,7 +20,7 @@ source "drivers/media/video/bt8xx/Kconfig" | |||
20 | 20 | ||
21 | config VIDEO_SAA6588 | 21 | config VIDEO_SAA6588 |
22 | tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" | 22 | tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards" |
23 | depends on VIDEO_DEV && I2C && VIDEO_BT848 | 23 | depends on I2C && VIDEO_BT848 |
24 | 24 | ||
25 | help | 25 | help |
26 | Support for Radio Data System (RDS) decoder. This allows seeing | 26 | Support for Radio Data System (RDS) decoder. This allows seeing |
@@ -32,7 +32,7 @@ config VIDEO_SAA6588 | |||
32 | 32 | ||
33 | config VIDEO_PMS | 33 | config VIDEO_PMS |
34 | tristate "Mediavision Pro Movie Studio Video For Linux" | 34 | tristate "Mediavision Pro Movie Studio Video For Linux" |
35 | depends on VIDEO_DEV && ISA | 35 | depends on ISA && VIDEO_V4L1 |
36 | help | 36 | help |
37 | Say Y if you have such a thing. | 37 | Say Y if you have such a thing. |
38 | 38 | ||
@@ -41,7 +41,7 @@ config VIDEO_PMS | |||
41 | 41 | ||
42 | config VIDEO_PLANB | 42 | config VIDEO_PLANB |
43 | tristate "PlanB Video-In on PowerMac" | 43 | tristate "PlanB Video-In on PowerMac" |
44 | depends on PPC_PMAC && VIDEO_DEV && BROKEN | 44 | depends on PPC_PMAC && VIDEO_V4L1 && BROKEN |
45 | help | 45 | help |
46 | PlanB is the V4L driver for the PowerMac 7x00/8x00 series video | 46 | PlanB is the V4L driver for the PowerMac 7x00/8x00 series video |
47 | input hardware. If you want to experiment with this, say Y. | 47 | input hardware. If you want to experiment with this, say Y. |
@@ -52,7 +52,7 @@ config VIDEO_PLANB | |||
52 | 52 | ||
53 | config VIDEO_BWQCAM | 53 | config VIDEO_BWQCAM |
54 | tristate "Quickcam BW Video For Linux" | 54 | tristate "Quickcam BW Video For Linux" |
55 | depends on VIDEO_DEV && PARPORT | 55 | depends on PARPORT && VIDEO_V4L1 |
56 | help | 56 | help |
57 | Say Y have if you the black and white version of the QuickCam | 57 | Say Y have if you the black and white version of the QuickCam |
58 | camera. See the next option for the color version. | 58 | camera. See the next option for the color version. |
@@ -62,7 +62,7 @@ config VIDEO_BWQCAM | |||
62 | 62 | ||
63 | config VIDEO_CQCAM | 63 | config VIDEO_CQCAM |
64 | tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)" | 64 | tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)" |
65 | depends on EXPERIMENTAL && VIDEO_DEV && PARPORT | 65 | depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1 |
66 | help | 66 | help |
67 | This is the video4linux driver for the colour version of the | 67 | This is the video4linux driver for the colour version of the |
68 | Connectix QuickCam. If you have one of these cameras, say Y here, | 68 | Connectix QuickCam. If you have one of these cameras, say Y here, |
@@ -73,7 +73,7 @@ config VIDEO_CQCAM | |||
73 | 73 | ||
74 | config VIDEO_W9966 | 74 | config VIDEO_W9966 |
75 | tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" | 75 | tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" |
76 | depends on PARPORT_1284 && VIDEO_DEV && PARPORT | 76 | depends on PARPORT_1284 && PARPORT && VIDEO_V4L1 |
77 | help | 77 | help |
78 | Video4linux driver for Winbond's w9966 based Webcams. | 78 | Video4linux driver for Winbond's w9966 based Webcams. |
79 | Currently tested with the LifeView FlyCam Supra. | 79 | Currently tested with the LifeView FlyCam Supra. |
@@ -86,7 +86,7 @@ config VIDEO_W9966 | |||
86 | 86 | ||
87 | config VIDEO_CPIA | 87 | config VIDEO_CPIA |
88 | tristate "CPiA Video For Linux" | 88 | tristate "CPiA Video For Linux" |
89 | depends on VIDEO_DEV | 89 | depends on VIDEO_V4L1 |
90 | ---help--- | 90 | ---help--- |
91 | This is the video4linux driver for cameras based on Vision's CPiA | 91 | This is the video4linux driver for cameras based on Vision's CPiA |
92 | (Colour Processor Interface ASIC), such as the Creative Labs Video | 92 | (Colour Processor Interface ASIC), such as the Creative Labs Video |
@@ -123,7 +123,7 @@ source "drivers/media/video/cpia2/Kconfig" | |||
123 | 123 | ||
124 | config VIDEO_SAA5246A | 124 | config VIDEO_SAA5246A |
125 | tristate "SAA5246A, SAA5281 Teletext processor" | 125 | tristate "SAA5246A, SAA5281 Teletext processor" |
126 | depends on VIDEO_DEV && I2C | 126 | depends on I2C && VIDEO_V4L1 |
127 | help | 127 | help |
128 | Support for I2C bus based teletext using the SAA5246A or SAA5281 | 128 | Support for I2C bus based teletext using the SAA5246A or SAA5281 |
129 | chip. Useful only if you live in Europe. | 129 | chip. Useful only if you live in Europe. |
@@ -150,7 +150,7 @@ config TUNER_3036 | |||
150 | 150 | ||
151 | config VIDEO_VINO | 151 | config VIDEO_VINO |
152 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" | 152 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" |
153 | depends on VIDEO_DEV && I2C && SGI_IP22 && EXPERIMENTAL | 153 | depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L1 |
154 | select I2C_ALGO_SGI | 154 | select I2C_ALGO_SGI |
155 | help | 155 | help |
156 | Say Y here to build in support for the Vino video input system found | 156 | Say Y here to build in support for the Vino video input system found |
@@ -158,7 +158,7 @@ config VIDEO_VINO | |||
158 | 158 | ||
159 | config VIDEO_STRADIS | 159 | config VIDEO_STRADIS |
160 | tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" | 160 | tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)" |
161 | depends on EXPERIMENTAL && VIDEO_DEV && PCI | 161 | depends on EXPERIMENTAL && PCI && VIDEO_V4L1 |
162 | help | 162 | help |
163 | Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video | 163 | Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video |
164 | driver for PCI. There is a product page at | 164 | driver for PCI. There is a product page at |
@@ -166,7 +166,7 @@ config VIDEO_STRADIS | |||
166 | 166 | ||
167 | config VIDEO_ZORAN | 167 | config VIDEO_ZORAN |
168 | tristate "Zoran ZR36057/36067 Video For Linux" | 168 | tristate "Zoran ZR36057/36067 Video For Linux" |
169 | depends on VIDEO_DEV && PCI && I2C_ALGOBIT | 169 | depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 |
170 | help | 170 | help |
171 | Say Y for support for MJPEG capture cards based on the Zoran | 171 | Say Y for support for MJPEG capture cards based on the Zoran |
172 | 36057/36067 PCI controller chipset. This includes the Iomega | 172 | 36057/36067 PCI controller chipset. This includes the Iomega |
@@ -214,7 +214,7 @@ config VIDEO_ZORAN_LML33R10 | |||
214 | 214 | ||
215 | config VIDEO_ZR36120 | 215 | config VIDEO_ZR36120 |
216 | tristate "Zoran ZR36120/36125 Video For Linux" | 216 | tristate "Zoran ZR36120/36125 Video For Linux" |
217 | depends on VIDEO_DEV && PCI && I2C && BROKEN | 217 | depends on PCI && I2C && VIDEO_V4L1 && BROKEN |
218 | help | 218 | help |
219 | Support for ZR36120/ZR36125 based frame grabber/overlay boards. | 219 | Support for ZR36120/ZR36125 based frame grabber/overlay boards. |
220 | This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV, | 220 | This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV, |
@@ -226,7 +226,7 @@ config VIDEO_ZR36120 | |||
226 | 226 | ||
227 | config VIDEO_MEYE | 227 | config VIDEO_MEYE |
228 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" | 228 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" |
229 | depends on VIDEO_DEV && PCI && SONYPI | 229 | depends on PCI && SONYPI && VIDEO_V4L1 |
230 | ---help--- | 230 | ---help--- |
231 | This is the video4linux driver for the Motion Eye camera found | 231 | This is the video4linux driver for the Motion Eye camera found |
232 | in the Vaio Picturebook laptops. Please read the material in | 232 | in the Vaio Picturebook laptops. Please read the material in |
@@ -242,7 +242,7 @@ source "drivers/media/video/saa7134/Kconfig" | |||
242 | 242 | ||
243 | config VIDEO_MXB | 243 | config VIDEO_MXB |
244 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" | 244 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" |
245 | depends on VIDEO_DEV && PCI | 245 | depends on PCI && VIDEO_V4L1 |
246 | select VIDEO_SAA7146_VV | 246 | select VIDEO_SAA7146_VV |
247 | select VIDEO_TUNER | 247 | select VIDEO_TUNER |
248 | ---help--- | 248 | ---help--- |
@@ -254,8 +254,9 @@ config VIDEO_MXB | |||
254 | 254 | ||
255 | config VIDEO_DPC | 255 | config VIDEO_DPC |
256 | tristate "Philips-Semiconductors 'dpc7146 demonstration board'" | 256 | tristate "Philips-Semiconductors 'dpc7146 demonstration board'" |
257 | depends on VIDEO_DEV && PCI | 257 | depends on PCI && VIDEO_V4L1 |
258 | select VIDEO_SAA7146_VV | 258 | select VIDEO_SAA7146_VV |
259 | select VIDEO_V4L2 | ||
259 | ---help--- | 260 | ---help--- |
260 | This is a video4linux driver for the 'dpc7146 demonstration | 261 | This is a video4linux driver for the 'dpc7146 demonstration |
261 | board' by Philips-Semiconductors. It's the reference design | 262 | board' by Philips-Semiconductors. It's the reference design |
@@ -268,8 +269,9 @@ config VIDEO_DPC | |||
268 | 269 | ||
269 | config VIDEO_HEXIUM_ORION | 270 | config VIDEO_HEXIUM_ORION |
270 | tristate "Hexium HV-PCI6 and Orion frame grabber" | 271 | tristate "Hexium HV-PCI6 and Orion frame grabber" |
271 | depends on VIDEO_DEV && PCI | 272 | depends on PCI && VIDEO_V4L1 |
272 | select VIDEO_SAA7146_VV | 273 | select VIDEO_SAA7146_VV |
274 | select VIDEO_V4L2 | ||
273 | ---help--- | 275 | ---help--- |
274 | This is a video4linux driver for the Hexium HV-PCI6 and | 276 | This is a video4linux driver for the Hexium HV-PCI6 and |
275 | Orion frame grabber cards by Hexium. | 277 | Orion frame grabber cards by Hexium. |
@@ -279,8 +281,9 @@ config VIDEO_HEXIUM_ORION | |||
279 | 281 | ||
280 | config VIDEO_HEXIUM_GEMINI | 282 | config VIDEO_HEXIUM_GEMINI |
281 | tristate "Hexium Gemini frame grabber" | 283 | tristate "Hexium Gemini frame grabber" |
282 | depends on VIDEO_DEV && PCI | 284 | depends on PCI && VIDEO_V4L1 |
283 | select VIDEO_SAA7146_VV | 285 | select VIDEO_SAA7146_VV |
286 | select VIDEO_V4L2 | ||
284 | ---help--- | 287 | ---help--- |
285 | This is a video4linux driver for the Hexium Gemini frame | 288 | This is a video4linux driver for the Hexium Gemini frame |
286 | grabber card by Hexium. Please note that the Gemini Dual | 289 | grabber card by Hexium. Please note that the Gemini Dual |
@@ -293,7 +296,7 @@ source "drivers/media/video/cx88/Kconfig" | |||
293 | 296 | ||
294 | config VIDEO_OVCAMCHIP | 297 | config VIDEO_OVCAMCHIP |
295 | tristate "OmniVision Camera Chip support" | 298 | tristate "OmniVision Camera Chip support" |
296 | depends on VIDEO_DEV && I2C | 299 | depends on I2C && VIDEO_V4L1 |
297 | ---help--- | 300 | ---help--- |
298 | Support for the OmniVision OV6xxx and OV7xxx series of camera chips. | 301 | Support for the OmniVision OV6xxx and OV7xxx series of camera chips. |
299 | This driver is intended to be used with the ov511 and w9968cf USB | 302 | This driver is intended to be used with the ov511 and w9968cf USB |
@@ -304,7 +307,7 @@ config VIDEO_OVCAMCHIP | |||
304 | 307 | ||
305 | config VIDEO_M32R_AR | 308 | config VIDEO_M32R_AR |
306 | tristate "AR devices" | 309 | tristate "AR devices" |
307 | depends on M32R | 310 | depends on M32R && VIDEO_V4L1 |
308 | ---help--- | 311 | ---help--- |
309 | This is a video4linux driver for the Renesas AR (Artificial Retina) | 312 | This is a video4linux driver for the Renesas AR (Artificial Retina) |
310 | camera module. | 313 | camera module. |
@@ -365,17 +368,17 @@ config VIDEO_WM8739 | |||
365 | source "drivers/media/video/cx25840/Kconfig" | 368 | source "drivers/media/video/cx25840/Kconfig" |
366 | 369 | ||
367 | config VIDEO_SAA711X | 370 | config VIDEO_SAA711X |
368 | tristate "Philips SAA7113/4/5 video decoders" | 371 | tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)" |
369 | depends on VIDEO_DEV && I2C && EXPERIMENTAL | 372 | depends on VIDEO_V4L1 && I2C && EXPERIMENTAL |
370 | ---help--- | 373 | ---help--- |
371 | Support for the Philips SAA7113/4/5 video decoders. | 374 | Old support for the Philips SAA7113/4 video decoders. |
372 | 375 | ||
373 | To compile this driver as a module, choose M here: the | 376 | To compile this driver as a module, choose M here: the |
374 | module will be called saa7115. | 377 | module will be called saa7115. |
375 | 378 | ||
376 | config VIDEO_SAA7127 | 379 | config VIDEO_SAA7127 |
377 | tristate "Philips SAA7127/9 digital video encoders" | 380 | tristate "Philips SAA7127/9 digital video encoders" |
378 | depends on VIDEO_DEV && I2C && EXPERIMENTAL | 381 | depends on VIDEO_V4L2 && I2C && EXPERIMENTAL |
379 | ---help--- | 382 | ---help--- |
380 | Support for the Philips SAA7127/9 digital video encoders. | 383 | Support for the Philips SAA7127/9 digital video encoders. |
381 | 384 | ||
@@ -384,7 +387,7 @@ config VIDEO_SAA7127 | |||
384 | 387 | ||
385 | config VIDEO_UPD64031A | 388 | config VIDEO_UPD64031A |
386 | tristate "NEC Electronics uPD64031A Ghost Reduction" | 389 | tristate "NEC Electronics uPD64031A Ghost Reduction" |
387 | depends on VIDEO_DEV && I2C && EXPERIMENTAL | 390 | depends on VIDEO_V4L2 && I2C && EXPERIMENTAL |
388 | ---help--- | 391 | ---help--- |
389 | Support for the NEC Electronics uPD64031A Ghost Reduction | 392 | Support for the NEC Electronics uPD64031A Ghost Reduction |
390 | video chip. It is most often found in NTSC TV cards made for | 393 | video chip. It is most often found in NTSC TV cards made for |
@@ -396,7 +399,7 @@ config VIDEO_UPD64031A | |||
396 | 399 | ||
397 | config VIDEO_UPD64083 | 400 | config VIDEO_UPD64083 |
398 | tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" | 401 | tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" |
399 | depends on VIDEO_DEV && I2C && EXPERIMENTAL | 402 | depends on VIDEO_V4L2 && I2C && EXPERIMENTAL |
400 | ---help--- | 403 | ---help--- |
401 | Support for the NEC Electronics uPD64083 3-Dimensional Y/C | 404 | Support for the NEC Electronics uPD64083 3-Dimensional Y/C |
402 | separation video chip. It is used to improve the quality of | 405 | separation video chip. It is used to improve the quality of |
@@ -418,7 +421,7 @@ source "drivers/media/video/em28xx/Kconfig" | |||
418 | 421 | ||
419 | config USB_DSBR | 422 | config USB_DSBR |
420 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" | 423 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" |
421 | depends on USB && VIDEO_DEV && EXPERIMENTAL | 424 | depends on USB && VIDEO_V4L1 && EXPERIMENTAL |
422 | ---help--- | 425 | ---help--- |
423 | Say Y here if you want to connect this type of radio to your | 426 | Say Y here if you want to connect this type of radio to your |
424 | computer's USB port. Note that the audio is not digital, and | 427 | computer's USB port. Note that the audio is not digital, and |
@@ -434,7 +437,7 @@ source "drivers/media/video/et61x251/Kconfig" | |||
434 | 437 | ||
435 | config USB_OV511 | 438 | config USB_OV511 |
436 | tristate "USB OV511 Camera support" | 439 | tristate "USB OV511 Camera support" |
437 | depends on USB && VIDEO_DEV | 440 | depends on USB && VIDEO_V4L1 |
438 | ---help--- | 441 | ---help--- |
439 | Say Y here if you want to connect this type of camera to your | 442 | Say Y here if you want to connect this type of camera to your |
440 | computer's USB port. See <file:Documentation/video4linux/ov511.txt> | 443 | computer's USB port. See <file:Documentation/video4linux/ov511.txt> |
@@ -445,7 +448,7 @@ config USB_OV511 | |||
445 | 448 | ||
446 | config USB_SE401 | 449 | config USB_SE401 |
447 | tristate "USB SE401 Camera support" | 450 | tristate "USB SE401 Camera support" |
448 | depends on USB && VIDEO_DEV | 451 | depends on USB && VIDEO_V4L1 |
449 | ---help--- | 452 | ---help--- |
450 | Say Y here if you want to connect this type of camera to your | 453 | Say Y here if you want to connect this type of camera to your |
451 | computer's USB port. See <file:Documentation/video4linux/se401.txt> | 454 | computer's USB port. See <file:Documentation/video4linux/se401.txt> |
@@ -458,7 +461,7 @@ source "drivers/media/video/sn9c102/Kconfig" | |||
458 | 461 | ||
459 | config USB_STV680 | 462 | config USB_STV680 |
460 | tristate "USB STV680 (Pencam) Camera support" | 463 | tristate "USB STV680 (Pencam) Camera support" |
461 | depends on USB && VIDEO_DEV | 464 | depends on USB && VIDEO_V4L1 |
462 | ---help--- | 465 | ---help--- |
463 | Say Y here if you want to connect this type of camera to your | 466 | Say Y here if you want to connect this type of camera to your |
464 | computer's USB port. This includes the Pencam line of cameras. | 467 | computer's USB port. This includes the Pencam line of cameras. |
@@ -470,7 +473,7 @@ config USB_STV680 | |||
470 | 473 | ||
471 | config USB_W9968CF | 474 | config USB_W9968CF |
472 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | 475 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" |
473 | depends on USB && VIDEO_DEV && I2C | 476 | depends on USB && VIDEO_V4L1 && I2C |
474 | select VIDEO_OVCAMCHIP | 477 | select VIDEO_OVCAMCHIP |
475 | ---help--- | 478 | ---help--- |
476 | Say Y here if you want support for cameras based on OV681 or | 479 | Say Y here if you want support for cameras based on OV681 or |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index b3ea2d63db9b..11b06dac347b 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -10,7 +10,8 @@ tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ | |||
10 | 10 | ||
11 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 11 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
12 | 12 | ||
13 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o | 13 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o |
14 | obj-$(CONFIG_VIDEO_V4L1_COMPAT) += v4l1-compat.o | ||
14 | 15 | ||
15 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | 16 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ |
16 | obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o | 17 | obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o |
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig index 085477c12612..153f6a4a96c9 100644 --- a/drivers/media/video/bt8xx/Kconfig +++ b/drivers/media/video/bt8xx/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
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 | 3 | depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 |
4 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
5 | select FW_LOADER | 5 | select FW_LOADER |
6 | select VIDEO_BTCX | 6 | select VIDEO_BTCX |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 72a417b31745..694d1d80ff3f 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -35,8 +35,10 @@ | |||
35 | #include "cx88.h" | 35 | #include "cx88.h" |
36 | #include <media/v4l2-common.h> | 36 | #include <media/v4l2-common.h> |
37 | 37 | ||
38 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
38 | /* Include V4L1 specific functions. Should be removed soon */ | 39 | /* Include V4L1 specific functions. Should be removed soon */ |
39 | #include <linux/videodev.h> | 40 | #include <linux/videodev.h> |
41 | #endif | ||
40 | 42 | ||
41 | MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); | 43 | MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); |
42 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); | 44 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); |
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig index 5a793ae7cc23..dfb15bfb83dc 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/video/em28xx/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config VIDEO_EM28XX | 1 | config VIDEO_EM28XX |
2 | tristate "Empia EM2800/2820/2840 USB video capture support" | 2 | tristate "Empia EM2800/2820/2840 USB video capture support" |
3 | depends on VIDEO_DEV && USB && I2C | 3 | depends on VIDEO_V4L1 && USB && I2C |
4 | select VIDEO_BUF | 4 | select VIDEO_BUF |
5 | select VIDEO_TUNER | 5 | select VIDEO_TUNER |
6 | select VIDEO_TVEEPROM | 6 | select VIDEO_TVEEPROM |
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig index 6c43a90c6569..c6bff705688d 100644 --- a/drivers/media/video/et61x251/Kconfig +++ b/drivers/media/video/et61x251/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_ET61X251 | 1 | config USB_ET61X251 |
2 | tristate "USB ET61X[12]51 PC Camera Controller support" | 2 | tristate "USB ET61X[12]51 PC Camera Controller support" |
3 | depends on USB && VIDEO_DEV | 3 | depends on USB && VIDEO_V4L1 |
4 | ---help--- | 4 | ---help--- |
5 | Say Y here if you want support for cameras based on Etoms ET61X151 | 5 | Say Y here if you want support for cameras based on Etoms ET61X151 |
6 | or ET61X251 PC Camera Controllers. | 6 | or ET61X251 PC Camera Controllers. |
diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig index 86376556f108..53cbc950f95c 100644 --- a/drivers/media/video/pwc/Kconfig +++ b/drivers/media/video/pwc/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_PWC | 1 | config USB_PWC |
2 | tristate "USB Philips Cameras" | 2 | tristate "USB Philips Cameras" |
3 | depends on USB && VIDEO_DEV | 3 | depends on USB && VIDEO_V4L1 |
4 | ---help--- | 4 | ---help--- |
5 | Say Y or M here if you want to use one of these Philips & OEM | 5 | Say Y or M here if you want to use one of these Philips & OEM |
6 | webcams: | 6 | webcams: |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index aeef80f88a6b..e4156ec9c6d7 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -31,8 +31,10 @@ | |||
31 | #include "saa7134.h" | 31 | #include "saa7134.h" |
32 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
33 | 33 | ||
34 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
34 | /* Include V4L1 specific functions. Should be removed soon */ | 35 | /* Include V4L1 specific functions. Should be removed soon */ |
35 | #include <linux/videodev.h> | 36 | #include <linux/videodev.h> |
37 | #endif | ||
36 | 38 | ||
37 | /* ------------------------------------------------------------------ */ | 39 | /* ------------------------------------------------------------------ */ |
38 | 40 | ||
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig index 55f2bc11964b..cf552e6b8ecf 100644 --- a/drivers/media/video/sn9c102/Kconfig +++ b/drivers/media/video/sn9c102/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_SN9C102 | 1 | config USB_SN9C102 |
2 | tristate "USB SN9C10x PC Camera Controller support" | 2 | tristate "USB SN9C10x PC Camera Controller support" |
3 | depends on USB && VIDEO_DEV | 3 | depends on USB && VIDEO_V4L1 |
4 | ---help--- | 4 | ---help--- |
5 | Say Y here if you want support for cameras based on SONiX SN9C101, | 5 | Say Y here if you want support for cameras based on SONiX SN9C101, |
6 | SN9C102 or SN9C103 PC Camera Controllers. | 6 | SN9C102 or SN9C103 PC Camera Controllers. |
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig index 08a5d20bb2c0..39269a2c5635 100644 --- a/drivers/media/video/usbvideo/Kconfig +++ b/drivers/media/video/usbvideo/Kconfig | |||
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO | |||
3 | 3 | ||
4 | config USB_VICAM | 4 | config USB_VICAM |
5 | tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)" | 5 | tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)" |
6 | depends on USB && VIDEO_DEV && EXPERIMENTAL | 6 | depends on USB && VIDEO_V4L1 && EXPERIMENTAL |
7 | select VIDEO_USBVIDEO | 7 | select VIDEO_USBVIDEO |
8 | ---help--- | 8 | ---help--- |
9 | Say Y here if you have 3com homeconnect camera (vicam). | 9 | Say Y here if you have 3com homeconnect camera (vicam). |
@@ -13,7 +13,7 @@ config USB_VICAM | |||
13 | 13 | ||
14 | config USB_IBMCAM | 14 | config USB_IBMCAM |
15 | tristate "USB IBM (Xirlink) C-it Camera support" | 15 | tristate "USB IBM (Xirlink) C-it Camera support" |
16 | depends on USB && VIDEO_DEV | 16 | depends on USB && VIDEO_V4L1 |
17 | select VIDEO_USBVIDEO | 17 | select VIDEO_USBVIDEO |
18 | ---help--- | 18 | ---help--- |
19 | Say Y here if you want to connect a IBM "C-It" camera, also known as | 19 | Say Y here if you want to connect a IBM "C-It" camera, also known as |
@@ -28,7 +28,7 @@ config USB_IBMCAM | |||
28 | 28 | ||
29 | config USB_KONICAWC | 29 | config USB_KONICAWC |
30 | tristate "USB Konica Webcam support" | 30 | tristate "USB Konica Webcam support" |
31 | depends on USB && VIDEO_DEV | 31 | depends on USB && VIDEO_V4L1 |
32 | select VIDEO_USBVIDEO | 32 | select VIDEO_USBVIDEO |
33 | ---help--- | 33 | ---help--- |
34 | Say Y here if you want support for webcams based on a Konica | 34 | Say Y here if you want support for webcams based on a Konica |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 5e813404d068..9e42224b46b6 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -26,6 +26,10 @@ | |||
26 | #include <linux/random.h> | 26 | #include <linux/random.h> |
27 | #include <linux/version.h> | 27 | #include <linux/version.h> |
28 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
29 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
30 | /* Include V4L1 specific functions. Should be removed soon */ | ||
31 | #include <linux/videodev.h> | ||
32 | #endif | ||
29 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
30 | #include <media/video-buf.h> | 34 | #include <media/video-buf.h> |
31 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig index c3bf886b80cd..115833e4f4dd 100644 --- a/drivers/media/video/zc0301/Kconfig +++ b/drivers/media/video/zc0301/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_ZC0301 | 1 | config USB_ZC0301 |
2 | tristate "USB ZC0301 Image Processor and Control Chip support" | 2 | tristate "USB ZC0301 Image Processor and Control Chip support" |
3 | depends on USB && VIDEO_DEV | 3 | depends on USB && VIDEO_V4L1 |
4 | ---help--- | 4 | ---help--- |
5 | Say Y here if you want support for cameras based on the ZC0301 | 5 | Say Y here if you want support for cameras based on the ZC0301 |
6 | Image Processor and Control Chip. | 6 | Image Processor and Control Chip. |