diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/Kconfig | 14 | ||||
-rw-r--r-- | drivers/media/video/Kconfig | 232 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 19 | ||||
-rw-r--r-- | drivers/media/video/dabfirmware.h (renamed from drivers/usb/media/dabfirmware.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/dabusb.c (renamed from drivers/usb/media/dabusb.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/dabusb.h (renamed from drivers/usb/media/dabusb.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/dsbr100.c (renamed from drivers/usb/media/dsbr100.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/et61x251/Makefile | 4 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251.h (renamed from drivers/usb/media/et61x251.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c (renamed from drivers/usb/media/et61x251_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251_sensor.h (renamed from drivers/usb/media/et61x251_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251_tas5130d1b.c (renamed from drivers/usb/media/et61x251_tas5130d1b.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/ov511.c (renamed from drivers/usb/media/ov511.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/ov511.h (renamed from drivers/usb/media/ov511.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/Makefile (renamed from drivers/usb/media/pwc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/philips.txt (renamed from drivers/usb/media/pwc/philips.txt) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-ctrl.c (renamed from drivers/usb/media/pwc/pwc-ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-if.c (renamed from drivers/usb/media/pwc/pwc-if.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-ioctl.h (renamed from drivers/usb/media/pwc/pwc-ioctl.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-kiara.c (renamed from drivers/usb/media/pwc/pwc-kiara.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-kiara.h (renamed from drivers/usb/media/pwc/pwc-kiara.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-misc.c (renamed from drivers/usb/media/pwc/pwc-misc.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-nala.h (renamed from drivers/usb/media/pwc/pwc-nala.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-timon.c (renamed from drivers/usb/media/pwc/pwc-timon.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-timon.h (renamed from drivers/usb/media/pwc/pwc-timon.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-uncompress.c (renamed from drivers/usb/media/pwc/pwc-uncompress.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-uncompress.h (renamed from drivers/usb/media/pwc/pwc-uncompress.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc.h (renamed from drivers/usb/media/pwc/pwc.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/se401.c (renamed from drivers/usb/media/se401.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/se401.h (renamed from drivers/usb/media/se401.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/Makefile | 7 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102.h (renamed from drivers/usb/media/sn9c102.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_core.c (renamed from drivers/usb/media/sn9c102_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_hv7131d.c (renamed from drivers/usb/media/sn9c102_hv7131d.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_mi0343.c (renamed from drivers/usb/media/sn9c102_mi0343.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_ov7630.c (renamed from drivers/usb/media/sn9c102_ov7630.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_pas106b.c (renamed from drivers/usb/media/sn9c102_pas106b.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_pas202bca.c (renamed from drivers/usb/media/sn9c102_pas202bca.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_pas202bcb.c (renamed from drivers/usb/media/sn9c102_pas202bcb.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_sensor.h (renamed from drivers/usb/media/sn9c102_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_tas5110c1b.c (renamed from drivers/usb/media/sn9c102_tas5110c1b.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_tas5130d1b.c (renamed from drivers/usb/media/sn9c102_tas5130d1b.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/stv680.c (renamed from drivers/usb/media/stv680.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/stv680.h (renamed from drivers/usb/media/stv680.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/Makefile | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/ibmcam.c (renamed from drivers/usb/media/ibmcam.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/konicawc.c (renamed from drivers/usb/media/konicawc.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/ultracam.c (renamed from drivers/usb/media/ultracam.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c (renamed from drivers/usb/media/usbvideo.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.h (renamed from drivers/usb/media/usbvideo.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c (renamed from drivers/usb/media/vicam.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/w9968cf.c (renamed from drivers/usb/media/w9968cf.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/w9968cf.h (renamed from drivers/usb/media/w9968cf.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/w9968cf_decoder.h (renamed from drivers/usb/media/w9968cf_decoder.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/w9968cf_vpp.h (renamed from drivers/usb/media/w9968cf_vpp.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/zc0301/Makefile | 3 | ||||
-rw-r--r-- | drivers/media/video/zc0301/zc0301.h (renamed from drivers/usb/media/zc0301.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/zc0301/zc0301_core.c (renamed from drivers/usb/media/zc0301_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/zc0301/zc0301_pas202bcb.c (renamed from drivers/usb/media/zc0301_pas202bcb.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/zc0301/zc0301_sensor.h (renamed from drivers/usb/media/zc0301_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/Makefile | 14 | ||||
-rw-r--r-- | drivers/usb/media/Kconfig | 241 | ||||
-rw-r--r-- | drivers/usb/media/Makefile | 24 |
64 files changed, 281 insertions, 283 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index c2602b340491..baa9f58beffc 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig | |||
@@ -50,5 +50,19 @@ config VIDEO_IR | |||
50 | config VIDEO_TVEEPROM | 50 | config VIDEO_TVEEPROM |
51 | tristate | 51 | tristate |
52 | 52 | ||
53 | config USB_DABUSB | ||
54 | tristate "DABUSB driver" | ||
55 | depends on USB | ||
56 | ---help--- | ||
57 | A Digital Audio Broadcasting (DAB) Receiver for USB and Linux | ||
58 | brought to you by the DAB-Team | ||
59 | <http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken | ||
60 | as an example for URB-based bulk, control, and isochronous | ||
61 | transactions. URB's are explained in | ||
62 | <Documentation/usb/URB.txt>. | ||
63 | |||
64 | To compile this driver as a module, choose M here: the | ||
65 | module will be called dabusb. | ||
66 | |||
53 | endmenu | 67 | endmenu |
54 | 68 | ||
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index b3d3b22d3f78..1f8a46b5916e 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -291,8 +291,6 @@ config VIDEO_HEXIUM_GEMINI | |||
291 | 291 | ||
292 | source "drivers/media/video/cx88/Kconfig" | 292 | source "drivers/media/video/cx88/Kconfig" |
293 | 293 | ||
294 | source "drivers/media/video/em28xx/Kconfig" | ||
295 | |||
296 | config VIDEO_OVCAMCHIP | 294 | config VIDEO_OVCAMCHIP |
297 | tristate "OmniVision Camera Chip support" | 295 | tristate "OmniVision Camera Chip support" |
298 | depends on VIDEO_DEV && I2C | 296 | depends on VIDEO_DEV && I2C |
@@ -367,4 +365,234 @@ config VIDEO_SAA7127 | |||
367 | To compile this driver as a module, choose M here: the | 365 | To compile this driver as a module, choose M here: the |
368 | module will be called saa7127 | 366 | module will be called saa7127 |
369 | 367 | ||
368 | # | ||
369 | # USB Multimedia device configuration | ||
370 | # | ||
371 | |||
372 | menu "V4L USB devices" | ||
373 | depends on USB && VIDEO_DEV | ||
374 | |||
375 | source "drivers/media/video/em28xx/Kconfig" | ||
376 | |||
377 | config USB_VICAM | ||
378 | tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)" | ||
379 | depends on USB && VIDEO_DEV && EXPERIMENTAL | ||
380 | ---help--- | ||
381 | Say Y here if you have 3com homeconnect camera (vicam). | ||
382 | |||
383 | This driver uses the Video For Linux API. You must say Y or M to | ||
384 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
385 | Information on this API and pointers to "v4l" programs may be found | ||
386 | at <file:Documentation/video4linux/API.html>. | ||
387 | |||
388 | To compile this driver as a module, choose M here: the | ||
389 | module will be called vicam. | ||
390 | |||
391 | config USB_DSBR | ||
392 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" | ||
393 | depends on USB && VIDEO_DEV && EXPERIMENTAL | ||
394 | ---help--- | ||
395 | Say Y here if you want to connect this type of radio to your | ||
396 | computer's USB port. Note that the audio is not digital, and | ||
397 | you must connect the line out connector to a sound card or a | ||
398 | set of speakers. | ||
399 | |||
400 | This driver uses the Video For Linux API. You must enable | ||
401 | (Y or M in config) Video For Linux (under Character Devices) | ||
402 | to use this driver. Information on this API and pointers to | ||
403 | "v4l" programs may be found at | ||
404 | <file:Documentation/video4linux/API.html>. | ||
405 | |||
406 | To compile this driver as a module, choose M here: the | ||
407 | module will be called dsbr100. | ||
408 | |||
409 | config USB_ET61X251 | ||
410 | tristate "USB ET61X[12]51 PC Camera Controller support" | ||
411 | depends on USB && VIDEO_DEV | ||
412 | ---help--- | ||
413 | Say Y here if you want support for cameras based on Etoms ET61X151 | ||
414 | or ET61X251 PC Camera Controllers. | ||
415 | |||
416 | See <file:Documentation/usb/et61x251.txt> for more informations. | ||
417 | |||
418 | This driver uses the Video For Linux API. You must say Y or M to | ||
419 | "Video For Linux" to use this driver. | ||
420 | |||
421 | To compile this driver as a module, choose M here: the | ||
422 | module will be called et61x251. | ||
423 | |||
424 | config USB_IBMCAM | ||
425 | tristate "USB IBM (Xirlink) C-it Camera support" | ||
426 | depends on USB && VIDEO_DEV | ||
427 | ---help--- | ||
428 | Say Y here if you want to connect a IBM "C-It" camera, also known as | ||
429 | "Xirlink PC Camera" to your computer's USB port. For more | ||
430 | information, read <file:Documentation/usb/ibmcam.txt>. | ||
431 | |||
432 | This driver uses the Video For Linux API. You must enable | ||
433 | (Y or M in config) Video For Linux (under Character Devices) | ||
434 | to use this driver. Information on this API and pointers to | ||
435 | "v4l" programs may be found at | ||
436 | <file:Documentation/video4linux/API.html>. | ||
437 | |||
438 | To compile this driver as a module, choose M here: the | ||
439 | module will be called ibmcam. | ||
440 | |||
441 | This camera has several configuration options which | ||
442 | can be specified when you load the module. Read | ||
443 | <file:Documentation/usb/ibmcam.txt> to learn more. | ||
444 | |||
445 | config USB_KONICAWC | ||
446 | tristate "USB Konica Webcam support" | ||
447 | depends on USB && VIDEO_DEV | ||
448 | ---help--- | ||
449 | Say Y here if you want support for webcams based on a Konica | ||
450 | chipset. This is known to work with the Intel YC76 webcam. | ||
451 | |||
452 | This driver uses the Video For Linux API. You must enable | ||
453 | (Y or M in config) Video For Linux (under Character Devices) | ||
454 | to use this driver. Information on this API and pointers to | ||
455 | "v4l" programs may be found at | ||
456 | <file:Documentation/video4linux/API.html>. | ||
457 | |||
458 | To compile this driver as a module, choose M here: the | ||
459 | module will be called konicawc. | ||
460 | |||
461 | config USB_OV511 | ||
462 | tristate "USB OV511 Camera support" | ||
463 | depends on USB && VIDEO_DEV | ||
464 | ---help--- | ||
465 | Say Y here if you want to connect this type of camera to your | ||
466 | computer's USB port. See <file:Documentation/usb/ov511.txt> for more | ||
467 | information and for a list of supported cameras. | ||
468 | |||
469 | This driver uses the Video For Linux API. You must say Y or M to | ||
470 | "Video For Linux" (under Character Devices) to use this driver. | ||
471 | Information on this API and pointers to "v4l" programs may be found | ||
472 | at <file:Documentation/video4linux/API.html>. | ||
473 | |||
474 | To compile this driver as a module, choose M here: the | ||
475 | module will be called ov511. | ||
476 | |||
477 | config USB_SE401 | ||
478 | tristate "USB SE401 Camera support" | ||
479 | depends on USB && VIDEO_DEV | ||
480 | ---help--- | ||
481 | Say Y here if you want to connect this type of camera to your | ||
482 | computer's USB port. See <file:Documentation/usb/se401.txt> for more | ||
483 | information and for a list of supported cameras. | ||
484 | |||
485 | This driver uses the Video For Linux API. You must say Y or M to | ||
486 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
487 | Information on this API and pointers to "v4l" programs may be found | ||
488 | at <file:Documentation/video4linux/API.html>. | ||
489 | |||
490 | To compile this driver as a module, choose M here: the | ||
491 | module will be called se401. | ||
492 | |||
493 | config USB_SN9C102 | ||
494 | tristate "USB SN9C10x PC Camera Controller support" | ||
495 | depends on USB && VIDEO_DEV | ||
496 | ---help--- | ||
497 | Say Y here if you want support for cameras based on SONiX SN9C101, | ||
498 | SN9C102 or SN9C103 PC Camera Controllers. | ||
499 | |||
500 | See <file:Documentation/usb/sn9c102.txt> for more informations. | ||
501 | |||
502 | This driver uses the Video For Linux API. You must say Y or M to | ||
503 | "Video For Linux" to use this driver. | ||
504 | |||
505 | To compile this driver as a module, choose M here: the | ||
506 | module will be called sn9c102. | ||
507 | |||
508 | config USB_STV680 | ||
509 | tristate "USB STV680 (Pencam) Camera support" | ||
510 | depends on USB && VIDEO_DEV | ||
511 | ---help--- | ||
512 | Say Y here if you want to connect this type of camera to your | ||
513 | computer's USB port. This includes the Pencam line of cameras. | ||
514 | See <file:Documentation/usb/stv680.txt> for more information and for | ||
515 | a list of supported cameras. | ||
516 | |||
517 | This driver uses the Video For Linux API. You must say Y or M to | ||
518 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
519 | Information on this API and pointers to "v4l" programs may be found | ||
520 | at <file:Documentation/video4linux/API.html>. | ||
521 | |||
522 | To compile this driver as a module, choose M here: the | ||
523 | module will be called stv680. | ||
524 | |||
525 | config USB_W9968CF | ||
526 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | ||
527 | depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP | ||
528 | ---help--- | ||
529 | Say Y here if you want support for cameras based on OV681 or | ||
530 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. | ||
531 | |||
532 | This driver has an optional plugin, which is distributed as a | ||
533 | separate module only (released under GPL). It allows to use higher | ||
534 | resolutions and framerates, but cannot be included in the official | ||
535 | Linux kernel for performance purposes. | ||
536 | |||
537 | See <file:Documentation/usb/w9968cf.txt> for more informations. | ||
538 | |||
539 | This driver uses the Video For Linux and the I2C APIs. It needs the | ||
540 | OmniVision Camera Chip support as well. You must say Y or M to | ||
541 | "Video For Linux", "I2C Support" and "OmniVision Camera Chip | ||
542 | support" to use this driver. | ||
543 | |||
544 | To compile this driver as a module, choose M here: the | ||
545 | module will be called w9968cf. | ||
546 | |||
547 | config USB_ZC0301 | ||
548 | tristate "USB ZC0301 Image Processor and Control Chip support" | ||
549 | depends on USB && VIDEO_DEV | ||
550 | ---help--- | ||
551 | Say Y here if you want support for cameras based on the ZC0301 | ||
552 | Image Processor and Control Chip. | ||
553 | |||
554 | See <file:Documentation/usb/zc0301.txt> for more informations. | ||
555 | |||
556 | This driver uses the Video For Linux API. You must say Y or M to | ||
557 | "Video For Linux" to use this driver. | ||
558 | |||
559 | To compile this driver as a module, choose M here: the | ||
560 | module will be called zc0301. | ||
561 | |||
562 | config USB_PWC | ||
563 | tristate "USB Philips Cameras" | ||
564 | depends on USB && VIDEO_DEV | ||
565 | ---help--- | ||
566 | Say Y or M here if you want to use one of these Philips & OEM | ||
567 | webcams: | ||
568 | * Philips PCA645, PCA646 | ||
569 | * Philips PCVC675, PCVC680, PCVC690 | ||
570 | * Philips PCVC720/40, PCVC730, PCVC740, PCVC750 | ||
571 | * Askey VC010 | ||
572 | * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' | ||
573 | and 'Orbit'/'Sphere' | ||
574 | * Samsung MPC-C10, MPC-C30 | ||
575 | * Creative Webcam 5, Pro Ex | ||
576 | * SOTEC Afina Eye | ||
577 | * Visionite VCS-UC300, VCS-UM100 | ||
578 | |||
579 | The PCA635, PCVC665 and PCVC720/20 are not supported by this driver | ||
580 | and never will be, but the 665 and 720/20 are supported by other | ||
581 | drivers. | ||
582 | |||
583 | See <file:Documentation/usb/philips.txt> for more information and | ||
584 | installation instructions. | ||
585 | |||
586 | The built-in microphone is enabled by selecting USB Audio support. | ||
587 | |||
588 | This driver uses the Video For Linux API. You must say Y or M to | ||
589 | "Video For Linux" (under Character Devices) to use this driver. | ||
590 | Information on this API and pointers to "v4l" programs may be found | ||
591 | at <file:Documentation/video4linux/API.html>. | ||
592 | |||
593 | To compile this driver as a module, choose M here: the | ||
594 | module will be called pwc. | ||
595 | |||
596 | endmenu # V4L USB devices | ||
597 | |||
370 | endmenu | 598 | endmenu |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 1a56a2d9e294..1c0e72e5a593 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -65,4 +65,23 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/ | |||
65 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o | 65 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o |
66 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o | 66 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o |
67 | 67 | ||
68 | et61x251-objs := et61x251_core.o et61x251_tas5130d1b.o | ||
69 | zc0301-objs := zc0301_core.o zc0301_pas202bcb.o | ||
70 | |||
71 | obj-$(CONFIG_USB_DABUSB) += dabusb.o | ||
72 | obj-$(CONFIG_USB_DSBR) += dsbr100.o | ||
73 | obj-$(CONFIG_USB_OV511) += ov511.o | ||
74 | obj-$(CONFIG_USB_SE401) += se401.o | ||
75 | obj-$(CONFIG_USB_STV680) += stv680.o | ||
76 | obj-$(CONFIG_USB_W9968CF) += w9968cf.o | ||
77 | |||
78 | obj-$(CONFIG_USB_SN9C102) += sn9c102/ | ||
79 | obj-$(CONFIG_USB_ET61X251) += et61x251/ | ||
80 | obj-$(CONFIG_USB_PWC) += pwc/ | ||
81 | obj-$(CONFIG_USB_ZC0301) += zc0301/ | ||
82 | |||
83 | obj-$(CONFIG_USB_IBMCAM) += usbvideo/ | ||
84 | obj-$(CONFIG_USB_KONICAWC) += usbvideo/ | ||
85 | obj-$(CONFIG_USB_VICAM) += usbvideo/ | ||
86 | |||
68 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core | 87 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core |
diff --git a/drivers/usb/media/dabfirmware.h b/drivers/media/video/dabfirmware.h index d14d803566a3..d14d803566a3 100644 --- a/drivers/usb/media/dabfirmware.h +++ b/drivers/media/video/dabfirmware.h | |||
diff --git a/drivers/usb/media/dabusb.c b/drivers/media/video/dabusb.c index 1774ab7a40d2..1774ab7a40d2 100644 --- a/drivers/usb/media/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
diff --git a/drivers/usb/media/dabusb.h b/drivers/media/video/dabusb.h index 96b03e4af8b9..96b03e4af8b9 100644 --- a/drivers/usb/media/dabusb.h +++ b/drivers/media/video/dabusb.h | |||
diff --git a/drivers/usb/media/dsbr100.c b/drivers/media/video/dsbr100.c index 25646804d5be..25646804d5be 100644 --- a/drivers/usb/media/dsbr100.c +++ b/drivers/media/video/dsbr100.c | |||
diff --git a/drivers/media/video/et61x251/Makefile b/drivers/media/video/et61x251/Makefile new file mode 100644 index 000000000000..2ff4db9ec882 --- /dev/null +++ b/drivers/media/video/et61x251/Makefile | |||
@@ -0,0 +1,4 @@ | |||
1 | et61x251-objs := et61x251_core.o et61x251_tas5130d1b.o | ||
2 | |||
3 | obj-$(CONFIG_USB_ET61X251) += et61x251.o | ||
4 | |||
diff --git a/drivers/usb/media/et61x251.h b/drivers/media/video/et61x251/et61x251.h index eee8afc9be72..eee8afc9be72 100644 --- a/drivers/usb/media/et61x251.h +++ b/drivers/media/video/et61x251/et61x251.h | |||
diff --git a/drivers/usb/media/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 7cc01b828b3d..7cc01b828b3d 100644 --- a/drivers/usb/media/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
diff --git a/drivers/usb/media/et61x251_sensor.h b/drivers/media/video/et61x251/et61x251_sensor.h index 56841ae8a207..56841ae8a207 100644 --- a/drivers/usb/media/et61x251_sensor.h +++ b/drivers/media/video/et61x251/et61x251_sensor.h | |||
diff --git a/drivers/usb/media/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c index 3998d76a307a..3998d76a307a 100644 --- a/drivers/usb/media/et61x251_tas5130d1b.c +++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c | |||
diff --git a/drivers/usb/media/ov511.c b/drivers/media/video/ov511.c index da44579d6f29..da44579d6f29 100644 --- a/drivers/usb/media/ov511.c +++ b/drivers/media/video/ov511.c | |||
diff --git a/drivers/usb/media/ov511.h b/drivers/media/video/ov511.h index bce9b3633889..bce9b3633889 100644 --- a/drivers/usb/media/ov511.h +++ b/drivers/media/video/ov511.h | |||
diff --git a/drivers/usb/media/pwc/Makefile b/drivers/media/video/pwc/Makefile index 2d93a775011a..2d93a775011a 100644 --- a/drivers/usb/media/pwc/Makefile +++ b/drivers/media/video/pwc/Makefile | |||
diff --git a/drivers/usb/media/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index 04a640d723ed..04a640d723ed 100644 --- a/drivers/usb/media/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt | |||
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c index 0398b812e0ce..0398b812e0ce 100644 --- a/drivers/usb/media/pwc/pwc-ctrl.c +++ b/drivers/media/video/pwc/pwc-ctrl.c | |||
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 90eb26042817..90eb26042817 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
diff --git a/drivers/usb/media/pwc/pwc-ioctl.h b/drivers/media/video/pwc/pwc-ioctl.h index 5f9cb08bc02e..5f9cb08bc02e 100644 --- a/drivers/usb/media/pwc/pwc-ioctl.h +++ b/drivers/media/video/pwc/pwc-ioctl.h | |||
diff --git a/drivers/usb/media/pwc/pwc-kiara.c b/drivers/media/video/pwc/pwc-kiara.c index c498c68bace1..c498c68bace1 100644 --- a/drivers/usb/media/pwc/pwc-kiara.c +++ b/drivers/media/video/pwc/pwc-kiara.c | |||
diff --git a/drivers/usb/media/pwc/pwc-kiara.h b/drivers/media/video/pwc/pwc-kiara.h index 12929abbb1f0..12929abbb1f0 100644 --- a/drivers/usb/media/pwc/pwc-kiara.h +++ b/drivers/media/video/pwc/pwc-kiara.h | |||
diff --git a/drivers/usb/media/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c index b7a4bd3524c7..b7a4bd3524c7 100644 --- a/drivers/usb/media/pwc/pwc-misc.c +++ b/drivers/media/video/pwc/pwc-misc.c | |||
diff --git a/drivers/usb/media/pwc/pwc-nala.h b/drivers/media/video/pwc/pwc-nala.h index e6c5cb69d03b..e6c5cb69d03b 100644 --- a/drivers/usb/media/pwc/pwc-nala.h +++ b/drivers/media/video/pwc/pwc-nala.h | |||
diff --git a/drivers/usb/media/pwc/pwc-timon.c b/drivers/media/video/pwc/pwc-timon.c index dee967173d6c..dee967173d6c 100644 --- a/drivers/usb/media/pwc/pwc-timon.c +++ b/drivers/media/video/pwc/pwc-timon.c | |||
diff --git a/drivers/usb/media/pwc/pwc-timon.h b/drivers/media/video/pwc/pwc-timon.h index a86b3782a081..a86b3782a081 100644 --- a/drivers/usb/media/pwc/pwc-timon.h +++ b/drivers/media/video/pwc/pwc-timon.h | |||
diff --git a/drivers/usb/media/pwc/pwc-uncompress.c b/drivers/media/video/pwc/pwc-uncompress.c index ef4204eab6c4..ef4204eab6c4 100644 --- a/drivers/usb/media/pwc/pwc-uncompress.c +++ b/drivers/media/video/pwc/pwc-uncompress.c | |||
diff --git a/drivers/usb/media/pwc/pwc-uncompress.h b/drivers/media/video/pwc/pwc-uncompress.h index d3b9250e4ed3..d3b9250e4ed3 100644 --- a/drivers/usb/media/pwc/pwc-uncompress.h +++ b/drivers/media/video/pwc/pwc-uncompress.h | |||
diff --git a/drivers/usb/media/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 6dd76bb3dff1..6dd76bb3dff1 100644 --- a/drivers/usb/media/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
diff --git a/drivers/usb/media/se401.c b/drivers/media/video/se401.c index f03ea7f89596..f03ea7f89596 100644 --- a/drivers/usb/media/se401.c +++ b/drivers/media/video/se401.c | |||
diff --git a/drivers/usb/media/se401.h b/drivers/media/video/se401.h index e88a40d4c86a..e88a40d4c86a 100644 --- a/drivers/usb/media/se401.h +++ b/drivers/media/video/se401.h | |||
diff --git a/drivers/media/video/sn9c102/Makefile b/drivers/media/video/sn9c102/Makefile new file mode 100644 index 000000000000..8bcb0f71d69f --- /dev/null +++ b/drivers/media/video/sn9c102/Makefile | |||
@@ -0,0 +1,7 @@ | |||
1 | sn9c102-objs := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o \ | ||
2 | sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bca.o \ | ||
3 | sn9c102_pas202bcb.o sn9c102_tas5110c1b.o \ | ||
4 | sn9c102_tas5130d1b.o | ||
5 | |||
6 | obj-$(CONFIG_USB_SN9C102) += sn9c102.o | ||
7 | |||
diff --git a/drivers/usb/media/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h index 1d70a62b9f23..1d70a62b9f23 100644 --- a/drivers/usb/media/sn9c102.h +++ b/drivers/media/video/sn9c102/sn9c102.h | |||
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 4c6cc6395723..4c6cc6395723 100644 --- a/drivers/usb/media/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
diff --git a/drivers/usb/media/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c index 46c12ec3ca62..46c12ec3ca62 100644 --- a/drivers/usb/media/sn9c102_hv7131d.c +++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c | |||
diff --git a/drivers/usb/media/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c index d9aa7a61095d..d9aa7a61095d 100644 --- a/drivers/usb/media/sn9c102_mi0343.c +++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c | |||
diff --git a/drivers/usb/media/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c index 42852b7cb042..42852b7cb042 100644 --- a/drivers/usb/media/sn9c102_ov7630.c +++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c | |||
diff --git a/drivers/usb/media/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c index b1dee78abe04..b1dee78abe04 100644 --- a/drivers/usb/media/sn9c102_pas106b.c +++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c | |||
diff --git a/drivers/usb/media/sn9c102_pas202bca.c b/drivers/media/video/sn9c102/sn9c102_pas202bca.c index 3453237055bb..3453237055bb 100644 --- a/drivers/usb/media/sn9c102_pas202bca.c +++ b/drivers/media/video/sn9c102/sn9c102_pas202bca.c | |||
diff --git a/drivers/usb/media/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c index d068616ab337..d068616ab337 100644 --- a/drivers/usb/media/sn9c102_pas202bcb.c +++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c | |||
diff --git a/drivers/usb/media/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h index 2afd9e9d09bb..2afd9e9d09bb 100644 --- a/drivers/usb/media/sn9c102_sensor.h +++ b/drivers/media/video/sn9c102/sn9c102_sensor.h | |||
diff --git a/drivers/usb/media/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c index 2e08c552f40a..2e08c552f40a 100644 --- a/drivers/usb/media/sn9c102_tas5110c1b.c +++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c | |||
diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c index c7b339740bbf..c7b339740bbf 100644 --- a/drivers/usb/media/sn9c102_tas5130d1b.c +++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c | |||
diff --git a/drivers/usb/media/stv680.c b/drivers/media/video/stv680.c index 9636da20748d..9636da20748d 100644 --- a/drivers/usb/media/stv680.c +++ b/drivers/media/video/stv680.c | |||
diff --git a/drivers/usb/media/stv680.h b/drivers/media/video/stv680.h index ea46e0001e6d..ea46e0001e6d 100644 --- a/drivers/usb/media/stv680.h +++ b/drivers/media/video/stv680.h | |||
diff --git a/drivers/media/video/usbvideo/Makefile b/drivers/media/video/usbvideo/Makefile new file mode 100644 index 000000000000..ed410a5ee8c9 --- /dev/null +++ b/drivers/media/video/usbvideo/Makefile | |||
@@ -0,0 +1,4 @@ | |||
1 | obj-$(CONFIG_USB_IBMCAM) += ibmcam.o usbvideo.o ultracam.o | ||
2 | obj-$(CONFIG_USB_KONICAWC) += konicawc.o usbvideo.o | ||
3 | obj-$(CONFIG_USB_VICAM) += vicam.o usbvideo.o | ||
4 | |||
diff --git a/drivers/usb/media/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c index a42c22294124..a42c22294124 100644 --- a/drivers/usb/media/ibmcam.c +++ b/drivers/media/video/usbvideo/ibmcam.c | |||
diff --git a/drivers/usb/media/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index e2ede583518f..e2ede583518f 100644 --- a/drivers/usb/media/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
diff --git a/drivers/usb/media/ultracam.c b/drivers/media/video/usbvideo/ultracam.c index 75ff755224df..75ff755224df 100644 --- a/drivers/usb/media/ultracam.c +++ b/drivers/media/video/usbvideo/ultracam.c | |||
diff --git a/drivers/usb/media/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 0b51fae720a9..0b51fae720a9 100644 --- a/drivers/usb/media/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
diff --git a/drivers/usb/media/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h index 135433c2680a..135433c2680a 100644 --- a/drivers/usb/media/usbvideo.h +++ b/drivers/media/video/usbvideo/usbvideo.h | |||
diff --git a/drivers/usb/media/vicam.c b/drivers/media/video/usbvideo/vicam.c index 1d06e53ec7c5..1d06e53ec7c5 100644 --- a/drivers/usb/media/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
diff --git a/drivers/usb/media/w9968cf.c b/drivers/media/video/w9968cf.c index b57dec3782e0..b57dec3782e0 100644 --- a/drivers/usb/media/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
diff --git a/drivers/usb/media/w9968cf.h b/drivers/media/video/w9968cf.h index a87be719a281..a87be719a281 100644 --- a/drivers/usb/media/w9968cf.h +++ b/drivers/media/video/w9968cf.h | |||
diff --git a/drivers/usb/media/w9968cf_decoder.h b/drivers/media/video/w9968cf_decoder.h index 31faccbe8f03..31faccbe8f03 100644 --- a/drivers/usb/media/w9968cf_decoder.h +++ b/drivers/media/video/w9968cf_decoder.h | |||
diff --git a/drivers/usb/media/w9968cf_vpp.h b/drivers/media/video/w9968cf_vpp.h index f3b91b782671..f3b91b782671 100644 --- a/drivers/usb/media/w9968cf_vpp.h +++ b/drivers/media/video/w9968cf_vpp.h | |||
diff --git a/drivers/media/video/zc0301/Makefile b/drivers/media/video/zc0301/Makefile new file mode 100644 index 000000000000..d749199d8f06 --- /dev/null +++ b/drivers/media/video/zc0301/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | zc0301-objs := zc0301_core.o zc0301_pas202bcb.o | ||
2 | |||
3 | obj-$(CONFIG_USB_ZC0301) += zc0301.o | ||
diff --git a/drivers/usb/media/zc0301.h b/drivers/media/video/zc0301/zc0301.h index 8e0655140e60..8e0655140e60 100644 --- a/drivers/usb/media/zc0301.h +++ b/drivers/media/video/zc0301/zc0301.h | |||
diff --git a/drivers/usb/media/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c index 4036c6268bff..4036c6268bff 100644 --- a/drivers/usb/media/zc0301_core.c +++ b/drivers/media/video/zc0301/zc0301_core.c | |||
diff --git a/drivers/usb/media/zc0301_pas202bcb.c b/drivers/media/video/zc0301/zc0301_pas202bcb.c index 9d282a22c15f..9d282a22c15f 100644 --- a/drivers/usb/media/zc0301_pas202bcb.c +++ b/drivers/media/video/zc0301/zc0301_pas202bcb.c | |||
diff --git a/drivers/usb/media/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h index cf0965a81d01..cf0965a81d01 100644 --- a/drivers/usb/media/zc0301_sensor.h +++ b/drivers/media/video/zc0301/zc0301_sensor.h | |||
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index b1222cd4aa46..7fdbc5dad5fd 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -87,8 +87,6 @@ source "drivers/usb/input/Kconfig" | |||
87 | 87 | ||
88 | source "drivers/usb/image/Kconfig" | 88 | source "drivers/usb/image/Kconfig" |
89 | 89 | ||
90 | source "drivers/usb/media/Kconfig" | ||
91 | |||
92 | source "drivers/usb/net/Kconfig" | 90 | source "drivers/usb/net/Kconfig" |
93 | 91 | ||
94 | source "drivers/usb/mon/Kconfig" | 92 | source "drivers/usb/mon/Kconfig" |
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index bb36a1c1dbb3..9b7d9769fdcc 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
@@ -35,20 +35,6 @@ obj-$(CONFIG_USB_WACOM) += input/ | |||
35 | obj-$(CONFIG_USB_ACECAD) += input/ | 35 | obj-$(CONFIG_USB_ACECAD) += input/ |
36 | obj-$(CONFIG_USB_XPAD) += input/ | 36 | obj-$(CONFIG_USB_XPAD) += input/ |
37 | 37 | ||
38 | obj-$(CONFIG_USB_DABUSB) += media/ | ||
39 | obj-$(CONFIG_USB_DSBR) += media/ | ||
40 | obj-$(CONFIG_USB_ET61X251) += media/ | ||
41 | obj-$(CONFIG_USB_IBMCAM) += media/ | ||
42 | obj-$(CONFIG_USB_KONICAWC) += media/ | ||
43 | obj-$(CONFIG_USB_OV511) += media/ | ||
44 | obj-$(CONFIG_USB_PWC) += media/ | ||
45 | obj-$(CONFIG_USB_SE401) += media/ | ||
46 | obj-$(CONFIG_USB_SN9C102) += media/ | ||
47 | obj-$(CONFIG_USB_STV680) += media/ | ||
48 | obj-$(CONFIG_USB_VICAM) += media/ | ||
49 | obj-$(CONFIG_USB_W9968CF) += media/ | ||
50 | obj-$(CONFIG_USB_ZC0301) += media/ | ||
51 | |||
52 | obj-$(CONFIG_USB_CATC) += net/ | 38 | obj-$(CONFIG_USB_CATC) += net/ |
53 | obj-$(CONFIG_USB_KAWETH) += net/ | 39 | obj-$(CONFIG_USB_KAWETH) += net/ |
54 | obj-$(CONFIG_USB_PEGASUS) += net/ | 40 | obj-$(CONFIG_USB_PEGASUS) += net/ |
diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig deleted file mode 100644 index 189d40f96be5..000000000000 --- a/drivers/usb/media/Kconfig +++ /dev/null | |||
@@ -1,241 +0,0 @@ | |||
1 | # | ||
2 | # USB Multimedia device configuration | ||
3 | # | ||
4 | comment "USB Multimedia devices" | ||
5 | depends on USB | ||
6 | |||
7 | config USB_DABUSB | ||
8 | tristate "DABUSB driver" | ||
9 | depends on USB | ||
10 | ---help--- | ||
11 | A Digital Audio Broadcasting (DAB) Receiver for USB and Linux | ||
12 | brought to you by the DAB-Team | ||
13 | <http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken | ||
14 | as an example for URB-based bulk, control, and isochronous | ||
15 | transactions. URB's are explained in | ||
16 | <file:Documentation/usb/URB.txt>. | ||
17 | |||
18 | To compile this driver as a module, choose M here: the | ||
19 | module will be called dabusb. | ||
20 | |||
21 | comment "Video4Linux support is needed for USB Multimedia device support" | ||
22 | depends on USB && VIDEO_DEV=n | ||
23 | |||
24 | config USB_VICAM | ||
25 | tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)" | ||
26 | depends on USB && VIDEO_DEV && EXPERIMENTAL | ||
27 | ---help--- | ||
28 | Say Y here if you have 3com homeconnect camera (vicam). | ||
29 | |||
30 | This driver uses the Video For Linux API. You must say Y or M to | ||
31 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
32 | Information on this API and pointers to "v4l" programs may be found | ||
33 | at <file:Documentation/video4linux/API.html>. | ||
34 | |||
35 | To compile this driver as a module, choose M here: the | ||
36 | module will be called vicam. | ||
37 | |||
38 | config USB_DSBR | ||
39 | tristate "D-Link USB FM radio support (EXPERIMENTAL)" | ||
40 | depends on USB && VIDEO_DEV && EXPERIMENTAL | ||
41 | ---help--- | ||
42 | Say Y here if you want to connect this type of radio to your | ||
43 | computer's USB port. Note that the audio is not digital, and | ||
44 | you must connect the line out connector to a sound card or a | ||
45 | set of speakers. | ||
46 | |||
47 | This driver uses the Video For Linux API. You must enable | ||
48 | (Y or M in config) Video For Linux (under Character Devices) | ||
49 | to use this driver. Information on this API and pointers to | ||
50 | "v4l" programs may be found at | ||
51 | <file:Documentation/video4linux/API.html>. | ||
52 | |||
53 | To compile this driver as a module, choose M here: the | ||
54 | module will be called dsbr100. | ||
55 | |||
56 | config USB_ET61X251 | ||
57 | tristate "USB ET61X[12]51 PC Camera Controller support" | ||
58 | depends on USB && VIDEO_DEV | ||
59 | ---help--- | ||
60 | Say Y here if you want support for cameras based on Etoms ET61X151 | ||
61 | or ET61X251 PC Camera Controllers. | ||
62 | |||
63 | See <file:Documentation/usb/et61x251.txt> for more informations. | ||
64 | |||
65 | This driver uses the Video For Linux API. You must say Y or M to | ||
66 | "Video For Linux" to use this driver. | ||
67 | |||
68 | To compile this driver as a module, choose M here: the | ||
69 | module will be called et61x251. | ||
70 | |||
71 | config USB_IBMCAM | ||
72 | tristate "USB IBM (Xirlink) C-it Camera support" | ||
73 | depends on USB && VIDEO_DEV | ||
74 | ---help--- | ||
75 | Say Y here if you want to connect a IBM "C-It" camera, also known as | ||
76 | "Xirlink PC Camera" to your computer's USB port. For more | ||
77 | information, read <file:Documentation/usb/ibmcam.txt>. | ||
78 | |||
79 | This driver uses the Video For Linux API. You must enable | ||
80 | (Y or M in config) Video For Linux (under Character Devices) | ||
81 | to use this driver. Information on this API and pointers to | ||
82 | "v4l" programs may be found at | ||
83 | <file:Documentation/video4linux/API.html>. | ||
84 | |||
85 | To compile this driver as a module, choose M here: the | ||
86 | module will be called ibmcam. | ||
87 | |||
88 | This camera has several configuration options which | ||
89 | can be specified when you load the module. Read | ||
90 | <file:Documentation/usb/ibmcam.txt> to learn more. | ||
91 | |||
92 | config USB_KONICAWC | ||
93 | tristate "USB Konica Webcam support" | ||
94 | depends on USB && VIDEO_DEV | ||
95 | ---help--- | ||
96 | Say Y here if you want support for webcams based on a Konica | ||
97 | chipset. This is known to work with the Intel YC76 webcam. | ||
98 | |||
99 | This driver uses the Video For Linux API. You must enable | ||
100 | (Y or M in config) Video For Linux (under Character Devices) | ||
101 | to use this driver. Information on this API and pointers to | ||
102 | "v4l" programs may be found at | ||
103 | <file:Documentation/video4linux/API.html>. | ||
104 | |||
105 | To compile this driver as a module, choose M here: the | ||
106 | module will be called konicawc. | ||
107 | |||
108 | config USB_OV511 | ||
109 | tristate "USB OV511 Camera support" | ||
110 | depends on USB && VIDEO_DEV | ||
111 | ---help--- | ||
112 | Say Y here if you want to connect this type of camera to your | ||
113 | computer's USB port. See <file:Documentation/usb/ov511.txt> for more | ||
114 | information and for a list of supported cameras. | ||
115 | |||
116 | This driver uses the Video For Linux API. You must say Y or M to | ||
117 | "Video For Linux" (under Character Devices) to use this driver. | ||
118 | Information on this API and pointers to "v4l" programs may be found | ||
119 | at <file:Documentation/video4linux/API.html>. | ||
120 | |||
121 | To compile this driver as a module, choose M here: the | ||
122 | module will be called ov511. | ||
123 | |||
124 | config USB_SE401 | ||
125 | tristate "USB SE401 Camera support" | ||
126 | depends on USB && VIDEO_DEV | ||
127 | ---help--- | ||
128 | Say Y here if you want to connect this type of camera to your | ||
129 | computer's USB port. See <file:Documentation/usb/se401.txt> for more | ||
130 | information and for a list of supported cameras. | ||
131 | |||
132 | This driver uses the Video For Linux API. You must say Y or M to | ||
133 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
134 | Information on this API and pointers to "v4l" programs may be found | ||
135 | at <file:Documentation/video4linux/API.html>. | ||
136 | |||
137 | To compile this driver as a module, choose M here: the | ||
138 | module will be called se401. | ||
139 | |||
140 | config USB_SN9C102 | ||
141 | tristate "USB SN9C10x PC Camera Controller support" | ||
142 | depends on USB && VIDEO_DEV | ||
143 | ---help--- | ||
144 | Say Y here if you want support for cameras based on SONiX SN9C101, | ||
145 | SN9C102 or SN9C103 PC Camera Controllers. | ||
146 | |||
147 | See <file:Documentation/usb/sn9c102.txt> for more informations. | ||
148 | |||
149 | This driver uses the Video For Linux API. You must say Y or M to | ||
150 | "Video For Linux" to use this driver. | ||
151 | |||
152 | To compile this driver as a module, choose M here: the | ||
153 | module will be called sn9c102. | ||
154 | |||
155 | config USB_STV680 | ||
156 | tristate "USB STV680 (Pencam) Camera support" | ||
157 | depends on USB && VIDEO_DEV | ||
158 | ---help--- | ||
159 | Say Y here if you want to connect this type of camera to your | ||
160 | computer's USB port. This includes the Pencam line of cameras. | ||
161 | See <file:Documentation/usb/stv680.txt> for more information and for | ||
162 | a list of supported cameras. | ||
163 | |||
164 | This driver uses the Video For Linux API. You must say Y or M to | ||
165 | "Video For Linux" (under Multimedia Devices) to use this driver. | ||
166 | Information on this API and pointers to "v4l" programs may be found | ||
167 | at <file:Documentation/video4linux/API.html>. | ||
168 | |||
169 | To compile this driver as a module, choose M here: the | ||
170 | module will be called stv680. | ||
171 | |||
172 | config USB_W9968CF | ||
173 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | ||
174 | depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP | ||
175 | ---help--- | ||
176 | Say Y here if you want support for cameras based on OV681 or | ||
177 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. | ||
178 | |||
179 | This driver has an optional plugin, which is distributed as a | ||
180 | separate module only (released under GPL). It allows to use higher | ||
181 | resolutions and framerates, but cannot be included in the official | ||
182 | Linux kernel for performance purposes. | ||
183 | |||
184 | See <file:Documentation/usb/w9968cf.txt> for more informations. | ||
185 | |||
186 | This driver uses the Video For Linux and the I2C APIs. It needs the | ||
187 | OmniVision Camera Chip support as well. You must say Y or M to | ||
188 | "Video For Linux", "I2C Support" and "OmniVision Camera Chip | ||
189 | support" to use this driver. | ||
190 | |||
191 | To compile this driver as a module, choose M here: the | ||
192 | module will be called w9968cf. | ||
193 | |||
194 | config USB_ZC0301 | ||
195 | tristate "USB ZC0301 Image Processor and Control Chip support" | ||
196 | depends on USB && VIDEO_DEV | ||
197 | ---help--- | ||
198 | Say Y here if you want support for cameras based on the ZC0301 | ||
199 | Image Processor and Control Chip. | ||
200 | |||
201 | See <file:Documentation/usb/zc0301.txt> for more informations. | ||
202 | |||
203 | This driver uses the Video For Linux API. You must say Y or M to | ||
204 | "Video For Linux" to use this driver. | ||
205 | |||
206 | To compile this driver as a module, choose M here: the | ||
207 | module will be called zc0301. | ||
208 | |||
209 | config USB_PWC | ||
210 | tristate "USB Philips Cameras" | ||
211 | depends on USB && VIDEO_DEV | ||
212 | ---help--- | ||
213 | Say Y or M here if you want to use one of these Philips & OEM | ||
214 | webcams: | ||
215 | * Philips PCA645, PCA646 | ||
216 | * Philips PCVC675, PCVC680, PCVC690 | ||
217 | * Philips PCVC720/40, PCVC730, PCVC740, PCVC750 | ||
218 | * Askey VC010 | ||
219 | * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' | ||
220 | and 'Orbit'/'Sphere' | ||
221 | * Samsung MPC-C10, MPC-C30 | ||
222 | * Creative Webcam 5, Pro Ex | ||
223 | * SOTEC Afina Eye | ||
224 | * Visionite VCS-UC300, VCS-UM100 | ||
225 | |||
226 | The PCA635, PCVC665 and PCVC720/20 are not supported by this driver | ||
227 | and never will be, but the 665 and 720/20 are supported by other | ||
228 | drivers. | ||
229 | |||
230 | See <file:Documentation/usb/philips.txt> for more information and | ||
231 | installation instructions. | ||
232 | |||
233 | The built-in microphone is enabled by selecting USB Audio support. | ||
234 | |||
235 | This driver uses the Video For Linux API. You must say Y or M to | ||
236 | "Video For Linux" (under Character Devices) to use this driver. | ||
237 | Information on this API and pointers to "v4l" programs may be found | ||
238 | at <file:Documentation/video4linux/API.html>. | ||
239 | |||
240 | To compile this driver as a module, choose M here: the | ||
241 | module will be called pwc. | ||
diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile deleted file mode 100644 index 50e89a33b85e..000000000000 --- a/drivers/usb/media/Makefile +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for USB Media drivers | ||
3 | # | ||
4 | |||
5 | sn9c102-objs := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o \ | ||
6 | sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bca.o \ | ||
7 | sn9c102_pas202bcb.o sn9c102_tas5110c1b.o \ | ||
8 | sn9c102_tas5130d1b.o | ||
9 | et61x251-objs := et61x251_core.o et61x251_tas5130d1b.o | ||
10 | zc0301-objs := zc0301_core.o zc0301_pas202bcb.o | ||
11 | |||
12 | obj-$(CONFIG_USB_DABUSB) += dabusb.o | ||
13 | obj-$(CONFIG_USB_DSBR) += dsbr100.o | ||
14 | obj-$(CONFIG_USB_ET61X251) += et61x251.o | ||
15 | obj-$(CONFIG_USB_IBMCAM) += ibmcam.o usbvideo.o ultracam.o | ||
16 | obj-$(CONFIG_USB_KONICAWC) += konicawc.o usbvideo.o | ||
17 | obj-$(CONFIG_USB_OV511) += ov511.o | ||
18 | obj-$(CONFIG_USB_SE401) += se401.o | ||
19 | obj-$(CONFIG_USB_SN9C102) += sn9c102.o | ||
20 | obj-$(CONFIG_USB_STV680) += stv680.o | ||
21 | obj-$(CONFIG_USB_VICAM) += vicam.o usbvideo.o | ||
22 | obj-$(CONFIG_USB_W9968CF) += w9968cf.o | ||
23 | obj-$(CONFIG_USB_ZC0301) += zc0301.o | ||
24 | obj-$(CONFIG_USB_PWC) += pwc/ | ||