diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-09 04:51:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:39:04 -0400 |
commit | 45d011031d745d2c9a21c21d289428cb7f88a2d0 (patch) | |
tree | f9d8cf3b8dd12541396b3a2b867d7ad8c8207490 /drivers/media/video/Kconfig | |
parent | 19c309e383610453604092473287f77233f31e90 (diff) |
V4L/DVB (9129): zoran: move zoran sources into a zoran subdirectory
Prevent the zoran driver sources from cluttering the video directory.
This changeset only moves the drivers and it does not fix any of the
checkpatch warnings/errors to keep the changeset clean.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r-- | drivers/media/video/Kconfig | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 2dce16f863bb..47102c2c8250 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -605,79 +605,7 @@ config VIDEO_STRADIS | |||
605 | driver for PCI. There is a product page at | 605 | driver for PCI. There is a product page at |
606 | <http://www.stradis.com/>. | 606 | <http://www.stradis.com/>. |
607 | 607 | ||
608 | config VIDEO_ZORAN | 608 | source "drivers/media/video/zoran/Kconfig" |
609 | tristate "Zoran ZR36057/36067 Video For Linux" | ||
610 | depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS | ||
611 | help | ||
612 | Say Y for support for MJPEG capture cards based on the Zoran | ||
613 | 36057/36067 PCI controller chipset. This includes the Iomega | ||
614 | Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is | ||
615 | a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For | ||
616 | more information, check <file:Documentation/video4linux/Zoran>. | ||
617 | |||
618 | To compile this driver as a module, choose M here: the | ||
619 | module will be called zr36067. | ||
620 | |||
621 | config VIDEO_ZORAN_DC30 | ||
622 | tristate "Pinnacle/Miro DC30(+) support" | ||
623 | depends on VIDEO_ZORAN | ||
624 | select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO | ||
625 | select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO | ||
626 | help | ||
627 | Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback | ||
628 | card. This also supports really old DC10 cards based on the | ||
629 | zr36050 MJPEG codec and zr36016 VFE. | ||
630 | |||
631 | config VIDEO_ZORAN_ZR36060 | ||
632 | tristate "Zoran ZR36060" | ||
633 | depends on VIDEO_ZORAN | ||
634 | help | ||
635 | Say Y to support Zoran boards based on 36060 chips. | ||
636 | This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33 | ||
637 | and 33 R10 and AverMedia 6 boards. | ||
638 | |||
639 | config VIDEO_ZORAN_BUZ | ||
640 | tristate "Iomega Buz support" | ||
641 | depends on VIDEO_ZORAN_ZR36060 | ||
642 | select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO | ||
643 | select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO | ||
644 | help | ||
645 | Support for the Iomega Buz MJPEG capture/playback card. | ||
646 | |||
647 | config VIDEO_ZORAN_DC10 | ||
648 | tristate "Pinnacle/Miro DC10(+) support" | ||
649 | depends on VIDEO_ZORAN_ZR36060 | ||
650 | select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO | ||
651 | select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO | ||
652 | help | ||
653 | Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback | ||
654 | card. | ||
655 | |||
656 | config VIDEO_ZORAN_LML33 | ||
657 | tristate "Linux Media Labs LML33 support" | ||
658 | depends on VIDEO_ZORAN_ZR36060 | ||
659 | select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO | ||
660 | select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO | ||
661 | help | ||
662 | Support for the Linux Media Labs LML33 MJPEG capture/playback | ||
663 | card. | ||
664 | |||
665 | config VIDEO_ZORAN_LML33R10 | ||
666 | tristate "Linux Media Labs LML33R10 support" | ||
667 | depends on VIDEO_ZORAN_ZR36060 | ||
668 | select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO | ||
669 | select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO | ||
670 | help | ||
671 | support for the Linux Media Labs LML33R10 MJPEG capture/playback | ||
672 | card. | ||
673 | |||
674 | config VIDEO_ZORAN_AVS6EYES | ||
675 | tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" | ||
676 | depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 | ||
677 | select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO | ||
678 | select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO | ||
679 | help | ||
680 | Support for the AverMedia 6 Eyes video surveillance card. | ||
681 | 609 | ||
682 | config VIDEO_MEYE | 610 | config VIDEO_MEYE |
683 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" | 611 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" |