diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 11:20:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 11:20:43 -0300 |
| commit | 1ddb193e59cc2b76550742b5099500b38bdf6668 (patch) | |
| tree | 2edfe688f579e2ae152f9da7dcd8894d6d57621b /linux/drivers/media/video/Kconfig | |
| parent | e6f2467bcc7b9ca1e7de8cd2ea21b2af83892c9d (diff) | |
| parent | 9a2bbcda776b51c070c6859a114fb00b06f1e392 (diff) | |
| download | mediapointer-dvb-s2-1ddb193e59cc2b76550742b5099500b38bdf6668.tar.gz mediapointer-dvb-s2-1ddb193e59cc2b76550742b5099500b38bdf6668.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index e4dd4181d..4df2ede38 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -18,7 +18,7 @@ config VIDEO_ADV_DEBUG config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_V4L2 + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 default n ---help--- Enables a virtual video driver. This device shows a color bar @@ -223,6 +223,12 @@ config VIDEO_ZORAN_LML33R10 support for the Linux Media Labs LML33R10 MJPEG capture/playback card. +config VIDEO_ZORAN_AVS6EYES + tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" + depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 + help + Support for the AverMedia 6 Eyes video surveillance card. + config VIDEO_ZR36120 tristate "Zoran ZR36120/36125 Video For Linux" depends on PCI && I2C && VIDEO_V4L1 && BROKEN |