vserver 1.9.3

[linux-2.6.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 90249af..d22dd93 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -112,11 +112,11 @@ config VIDEO_CPIA_USB
          It is also available as a module (cpia_usb).
 
 config VIDEO_SAA5246A
-       tristate "SAA5246A Teletext processor"
+       tristate "SAA5246A, SAA5281 Teletext processor"
        depends on VIDEO_DEV && I2C
        help
-         Support for I2C bus based teletext using the SAA5246A chip. Useful
-         only if you live in Europe.
+         Support for I2C bus based teletext using the SAA5246A or SAA5281
+         chip. Useful only if you live in Europe.
 
          To compile this driver as a module, choose M here: the
          module will be called saa5246a.
@@ -155,7 +155,7 @@ config VIDEO_STRADIS
 
 config VIDEO_ZORAN
        tristate "Zoran ZR36057/36067 Video For Linux"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI && I2C_ALGOBIT
        help
          Say Y for support for MJPEG capture cards based on the Zoran
          36057/36067 PCI controller chipset. This includes the Iomega
@@ -295,5 +295,16 @@ config VIDEO_CX88
          To compile this driver as a module, choose M here: the
          module will be called cx8800
 
+config VIDEO_OVCAMCHIP
+       tristate "OmniVision Camera Chip support"
+       depends on VIDEO_DEV && I2C
+       ---help---
+         Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
+         This driver is intended to be used with the ov511 and w9968cf USB
+         camera drivers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ovcamchip
+
 endmenu