aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorMartin Samuelsson <sam@home.se>2006-04-27 09:17:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:59:28 -0400
commitfbe60daac4c34e39d1ca69684bcb76e62461ac21 (patch)
treed399de101564f542681223a45c47caffcab71da0 /drivers/media/video/Kconfig
parenta87cde0bfbf0020a5d0a80f94a80fc1470546999 (diff)
V4L/DVB (3916): AverMedia 6 Eyes AVS6EYES support
Add support for the AverMedia 6 Eyes MJPEG card. - Updated drivers/media/video/Kconfig with AVS6EYES options. - Added CONFIG_VIDEO_ZORAN_AVS6EYES to drivers/media/video/Makefile. - Added I2C_DRIVERID_BT866 and I2C_DRIVERID_KS0127 to include/linux/i2c-id.h - Added drivers/media/video/ks0127.c, imported and modified from the Marvel project. - Added drivers/media/video/ks0127.h, imported and modified from the Marvel project. - Added drivers/media/video/bt866.c, ported from a 2.4 version by Christer Weinigel. - Added AVS6EYES to drivers/media/video/zoran_card.c - Added input_mux to all cards in drivers/media/video/zoran_card.c - Added input mux module parameter to drivers/media/video/zoran_card.c - Added AVS6EYES to card_type in drivers/media/video/zoran.h - Added input_mux to card_info in drivers/media/video/zoran.h - Upped BUZ_MAX_INPUT in drivers/media/video/zoran.h from 8 to 16, as the AVS6EYES has 10. - Updated Documentation/video4linux/Zoran with information about AVS6EYES. Signed-off-by: Martin Samuelsson <sam@home.se> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r--drivers/media/video/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6b4197018561..515e16acf0dd 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -224,6 +224,12 @@ config VIDEO_ZORAN_LML33R10
224 support for the Linux Media Labs LML33R10 MJPEG capture/playback 224 support for the Linux Media Labs LML33R10 MJPEG capture/playback
225 card. 225 card.
226 226
227config VIDEO_ZORAN_AVS6EYES
228 tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
229 depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1
230 help
231 Support for the AverMedia 6 Eyes video surveillance card.
232
227config VIDEO_ZR36120 233config VIDEO_ZR36120
228 tristate "Zoran ZR36120/36125 Video For Linux" 234 tristate "Zoran ZR36120/36125 Video For Linux"
229 depends on PCI && I2C && VIDEO_V4L1 && BROKEN 235 depends on PCI && I2C && VIDEO_V4L1 && BROKEN