diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:03:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:03:59 -0400 |
commit | cf2fa66055d718ae13e62451bb546505f63906a2 (patch) | |
tree | e206d3f04e74a34e9aa88d21af6c26eea21d4121 /drivers/media/video/Kconfig | |
parent | 4501a466f28788485604ee42641d7a5fe7258d16 (diff) | |
parent | 57f51dbc45f65f7ee1e8c8f77200bb8000e3e271 (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
V4L/DVB (9179): S2API: frontend.h cleanup
V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
V4L/DVB: v4l2-dev: remove duplicated #include
...
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r-- | drivers/media/video/Kconfig | 235 |
1 files changed, 77 insertions, 158 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 3e9e0dcd217e..47102c2c8250 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -34,6 +34,7 @@ config VIDEOBUF_DVB | |||
34 | select VIDEOBUF_GEN | 34 | select VIDEOBUF_GEN |
35 | 35 | ||
36 | config VIDEO_BTCX | 36 | config VIDEO_BTCX |
37 | depends on PCI | ||
37 | tristate | 38 | tristate |
38 | 39 | ||
39 | config VIDEO_IR | 40 | config VIDEO_IR |
@@ -71,6 +72,15 @@ config VIDEO_ADV_DEBUG | |||
71 | V4L devices. | 72 | V4L devices. |
72 | In doubt, say N. | 73 | In doubt, say N. |
73 | 74 | ||
75 | config VIDEO_FIXED_MINOR_RANGES | ||
76 | bool "Enable old-style fixed minor ranges for video devices" | ||
77 | default n | ||
78 | ---help--- | ||
79 | Say Y here to enable the old-style fixed-range minor assignments. | ||
80 | Only useful if you rely on the old behavior and use mknod instead of udev. | ||
81 | |||
82 | When in doubt, say N. | ||
83 | |||
74 | config VIDEO_HELPER_CHIPS_AUTO | 84 | config VIDEO_HELPER_CHIPS_AUTO |
75 | bool "Autoselect pertinent encoders/decoders and other helper chips" | 85 | bool "Autoselect pertinent encoders/decoders and other helper chips" |
76 | default y | 86 | default y |
@@ -578,13 +588,6 @@ config VIDEO_SAA5249 | |||
578 | To compile this driver as a module, choose M here: the | 588 | To compile this driver as a module, choose M here: the |
579 | module will be called saa5249. | 589 | module will be called saa5249. |
580 | 590 | ||
581 | config TUNER_3036 | ||
582 | tristate "SAB3036 tuner" | ||
583 | depends on I2C && VIDEO_V4L1 | ||
584 | help | ||
585 | Say Y here to include support for Philips SAB3036 compatible tuners. | ||
586 | If in doubt, say N. | ||
587 | |||
588 | config VIDEO_VINO | 591 | config VIDEO_VINO |
589 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" | 592 | tristate "SGI Vino Video For Linux (EXPERIMENTAL)" |
590 | depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 | 593 | depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 |
@@ -602,79 +605,7 @@ config VIDEO_STRADIS | |||
602 | driver for PCI. There is a product page at | 605 | driver for PCI. There is a product page at |
603 | <http://www.stradis.com/>. | 606 | <http://www.stradis.com/>. |
604 | 607 | ||
605 | config VIDEO_ZORAN | 608 | source "drivers/media/video/zoran/Kconfig" |
606 | tristate "Zoran ZR36057/36067 Video For Linux" | ||
607 | depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS | ||
608 | help | ||
609 | Say Y for support for MJPEG capture cards based on the Zoran | ||
610 | 36057/36067 PCI controller chipset. This includes the Iomega | ||
611 | Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is | ||
612 | a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For | ||
613 | more information, check <file:Documentation/video4linux/Zoran>. | ||
614 | |||
615 | To compile this driver as a module, choose M here: the | ||
616 | module will be called zr36067. | ||
617 | |||
618 | config VIDEO_ZORAN_DC30 | ||
619 | tristate "Pinnacle/Miro DC30(+) support" | ||
620 | depends on VIDEO_ZORAN | ||
621 | select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO | ||
622 | select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO | ||
623 | help | ||
624 | Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback | ||
625 | card. This also supports really old DC10 cards based on the | ||
626 | zr36050 MJPEG codec and zr36016 VFE. | ||
627 | |||
628 | config VIDEO_ZORAN_ZR36060 | ||
629 | tristate "Zoran ZR36060" | ||
630 | depends on VIDEO_ZORAN | ||
631 | help | ||
632 | Say Y to support Zoran boards based on 36060 chips. | ||
633 | This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33 | ||
634 | and 33 R10 and AverMedia 6 boards. | ||
635 | |||
636 | config VIDEO_ZORAN_BUZ | ||
637 | tristate "Iomega Buz support" | ||
638 | depends on VIDEO_ZORAN_ZR36060 | ||
639 | select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO | ||
640 | select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO | ||
641 | help | ||
642 | Support for the Iomega Buz MJPEG capture/playback card. | ||
643 | |||
644 | config VIDEO_ZORAN_DC10 | ||
645 | tristate "Pinnacle/Miro DC10(+) support" | ||
646 | depends on VIDEO_ZORAN_ZR36060 | ||
647 | select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO | ||
648 | select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO | ||
649 | help | ||
650 | Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback | ||
651 | card. | ||
652 | |||
653 | config VIDEO_ZORAN_LML33 | ||
654 | tristate "Linux Media Labs LML33 support" | ||
655 | depends on VIDEO_ZORAN_ZR36060 | ||
656 | select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO | ||
657 | select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO | ||
658 | help | ||
659 | Support for the Linux Media Labs LML33 MJPEG capture/playback | ||
660 | card. | ||
661 | |||
662 | config VIDEO_ZORAN_LML33R10 | ||
663 | tristate "Linux Media Labs LML33R10 support" | ||
664 | depends on VIDEO_ZORAN_ZR36060 | ||
665 | select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO | ||
666 | select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO | ||
667 | help | ||
668 | support for the Linux Media Labs LML33R10 MJPEG capture/playback | ||
669 | card. | ||
670 | |||
671 | config VIDEO_ZORAN_AVS6EYES | ||
672 | tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" | ||
673 | depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 | ||
674 | select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO | ||
675 | select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO | ||
676 | help | ||
677 | Support for the AverMedia 6 Eyes video surveillance card. | ||
678 | 609 | ||
679 | config VIDEO_MEYE | 610 | config VIDEO_MEYE |
680 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" | 611 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" |
@@ -697,7 +628,7 @@ config VIDEO_MXB | |||
697 | depends on PCI && VIDEO_V4L1 && I2C | 628 | depends on PCI && VIDEO_V4L1 && I2C |
698 | select VIDEO_SAA7146_VV | 629 | select VIDEO_SAA7146_VV |
699 | select VIDEO_TUNER | 630 | select VIDEO_TUNER |
700 | select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO | 631 | select VIDEO_SAA7115 if VIDEO_HELPER_CHIPS_AUTO |
701 | select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO | 632 | select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO |
702 | select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO | 633 | select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO |
703 | select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO | 634 | select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO |
@@ -708,21 +639,6 @@ config VIDEO_MXB | |||
708 | To compile this driver as a module, choose M here: the | 639 | To compile this driver as a module, choose M here: the |
709 | module will be called mxb. | 640 | module will be called mxb. |
710 | 641 | ||
711 | config VIDEO_DPC | ||
712 | tristate "Philips-Semiconductors 'dpc7146 demonstration board'" | ||
713 | depends on PCI && VIDEO_V4L1 && I2C | ||
714 | select VIDEO_SAA7146_VV | ||
715 | select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO | ||
716 | ---help--- | ||
717 | This is a video4linux driver for the 'dpc7146 demonstration | ||
718 | board' by Philips-Semiconductors. It's the reference design | ||
719 | for SAA7146 bases boards, so if you have some unsupported | ||
720 | saa7146 based, analog video card, chances are good that it | ||
721 | will work with this skeleton driver. | ||
722 | |||
723 | To compile this driver as a module, choose M here: the | ||
724 | module will be called dpc7146. | ||
725 | |||
726 | config VIDEO_HEXIUM_ORION | 642 | config VIDEO_HEXIUM_ORION |
727 | tristate "Hexium HV-PCI6 and Orion frame grabber" | 643 | tristate "Hexium HV-PCI6 and Orion frame grabber" |
728 | depends on PCI && VIDEO_V4L2 && I2C | 644 | depends on PCI && VIDEO_V4L2 && I2C |
@@ -784,6 +700,70 @@ config VIDEO_CAFE_CCIC | |||
784 | CMOS camera controller. This is the controller found on first- | 700 | CMOS camera controller. This is the controller found on first- |
785 | generation OLPC systems. | 701 | generation OLPC systems. |
786 | 702 | ||
703 | config SOC_CAMERA | ||
704 | tristate "SoC camera support" | ||
705 | depends on VIDEO_V4L2 && HAS_DMA | ||
706 | select VIDEOBUF_GEN | ||
707 | help | ||
708 | SoC Camera is a common API to several cameras, not connecting | ||
709 | over a bus like PCI or USB. For example some i2c camera connected | ||
710 | directly to the data bus of an SoC. | ||
711 | |||
712 | config SOC_CAMERA_MT9M001 | ||
713 | tristate "mt9m001 support" | ||
714 | depends on SOC_CAMERA && I2C | ||
715 | select GPIO_PCA953X if MT9M001_PCA9536_SWITCH | ||
716 | help | ||
717 | This driver supports MT9M001 cameras from Micron, monochrome | ||
718 | and colour models. | ||
719 | |||
720 | config MT9M001_PCA9536_SWITCH | ||
721 | bool "pca9536 datawidth switch for mt9m001" | ||
722 | depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO | ||
723 | help | ||
724 | Select this if your MT9M001 camera uses a PCA9536 I2C GPIO | ||
725 | extender to switch between 8 and 10 bit datawidth modes | ||
726 | |||
727 | config SOC_CAMERA_MT9M111 | ||
728 | tristate "mt9m111 support" | ||
729 | depends on SOC_CAMERA && I2C | ||
730 | help | ||
731 | This driver supports MT9M111 cameras from Micron | ||
732 | |||
733 | config SOC_CAMERA_MT9V022 | ||
734 | tristate "mt9v022 support" | ||
735 | depends on SOC_CAMERA && I2C | ||
736 | select GPIO_PCA953X if MT9V022_PCA9536_SWITCH | ||
737 | help | ||
738 | This driver supports MT9V022 cameras from Micron | ||
739 | |||
740 | config MT9V022_PCA9536_SWITCH | ||
741 | bool "pca9536 datawidth switch for mt9v022" | ||
742 | depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO | ||
743 | help | ||
744 | Select this if your MT9V022 camera uses a PCA9536 I2C GPIO | ||
745 | extender to switch between 8 and 10 bit datawidth modes | ||
746 | |||
747 | config SOC_CAMERA_PLATFORM | ||
748 | tristate "platform camera support" | ||
749 | depends on SOC_CAMERA | ||
750 | help | ||
751 | This is a generic SoC camera platform driver, useful for testing | ||
752 | |||
753 | config VIDEO_PXA27x | ||
754 | tristate "PXA27x Quick Capture Interface driver" | ||
755 | depends on VIDEO_DEV && PXA27x && SOC_CAMERA | ||
756 | select VIDEOBUF_DMA_SG | ||
757 | ---help--- | ||
758 | This is a v4l2 driver for the PXA27x Quick Capture Interface | ||
759 | |||
760 | config VIDEO_SH_MOBILE_CEU | ||
761 | tristate "SuperH Mobile CEU Interface driver" | ||
762 | depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA | ||
763 | select VIDEOBUF_DMA_CONTIG | ||
764 | ---help--- | ||
765 | This is a v4l2 driver for the SuperH Mobile CEU Interface | ||
766 | |||
787 | # | 767 | # |
788 | # USB Multimedia device configuration | 768 | # USB Multimedia device configuration |
789 | # | 769 | # |
@@ -822,8 +802,7 @@ config VIDEO_OVCAMCHIP | |||
822 | 802 | ||
823 | config USB_W9968CF | 803 | config USB_W9968CF |
824 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | 804 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" |
825 | depends on VIDEO_V4L1 && I2C | 805 | depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP |
826 | select VIDEO_OVCAMCHIP | ||
827 | ---help--- | 806 | ---help--- |
828 | Say Y here if you want support for cameras based on OV681 or | 807 | Say Y here if you want support for cameras based on OV681 or |
829 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. | 808 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. |
@@ -914,64 +893,4 @@ config USB_S2255 | |||
914 | 893 | ||
915 | endif # V4L_USB_DRIVERS | 894 | endif # V4L_USB_DRIVERS |
916 | 895 | ||
917 | config SOC_CAMERA | ||
918 | tristate "SoC camera support" | ||
919 | depends on VIDEO_V4L2 && HAS_DMA | ||
920 | select VIDEOBUF_GEN | ||
921 | help | ||
922 | SoC Camera is a common API to several cameras, not connecting | ||
923 | over a bus like PCI or USB. For example some i2c camera connected | ||
924 | directly to the data bus of an SoC. | ||
925 | |||
926 | config SOC_CAMERA_MT9M001 | ||
927 | tristate "mt9m001 support" | ||
928 | depends on SOC_CAMERA && I2C | ||
929 | select GPIO_PCA953X if MT9M001_PCA9536_SWITCH | ||
930 | help | ||
931 | This driver supports MT9M001 cameras from Micron, monochrome | ||
932 | and colour models. | ||
933 | |||
934 | config MT9M001_PCA9536_SWITCH | ||
935 | bool "pca9536 datawidth switch for mt9m001" | ||
936 | depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO | ||
937 | help | ||
938 | Select this if your MT9M001 camera uses a PCA9536 I2C GPIO | ||
939 | extender to switch between 8 and 10 bit datawidth modes | ||
940 | |||
941 | config SOC_CAMERA_MT9V022 | ||
942 | tristate "mt9v022 support" | ||
943 | depends on SOC_CAMERA && I2C | ||
944 | select GPIO_PCA953X if MT9V022_PCA9536_SWITCH | ||
945 | help | ||
946 | This driver supports MT9V022 cameras from Micron | ||
947 | |||
948 | config MT9V022_PCA9536_SWITCH | ||
949 | bool "pca9536 datawidth switch for mt9v022" | ||
950 | depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO | ||
951 | help | ||
952 | Select this if your MT9V022 camera uses a PCA9536 I2C GPIO | ||
953 | extender to switch between 8 and 10 bit datawidth modes | ||
954 | |||
955 | config SOC_CAMERA_PLATFORM | ||
956 | tristate "platform camera support" | ||
957 | depends on SOC_CAMERA | ||
958 | help | ||
959 | This is a generic SoC camera platform driver, useful for testing | ||
960 | |||
961 | config VIDEO_PXA27x | ||
962 | tristate "PXA27x Quick Capture Interface driver" | ||
963 | depends on VIDEO_DEV && PXA27x | ||
964 | select SOC_CAMERA | ||
965 | select VIDEOBUF_DMA_SG | ||
966 | ---help--- | ||
967 | This is a v4l2 driver for the PXA27x Quick Capture Interface | ||
968 | |||
969 | config VIDEO_SH_MOBILE_CEU | ||
970 | tristate "SuperH Mobile CEU Interface driver" | ||
971 | depends on VIDEO_DEV && HAS_DMA | ||
972 | select SOC_CAMERA | ||
973 | select VIDEOBUF_DMA_CONTIG | ||
974 | ---help--- | ||
975 | This is a v4l2 driver for the SuperH Mobile CEU Interface | ||
976 | |||
977 | endif # VIDEO_CAPTURE_DRIVERS | 896 | endif # VIDEO_CAPTURE_DRIVERS |