Pull ec into release branch

[pandora-kernel.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bf26755..ff6aefd 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -24,7 +24,7 @@ config VIDEO_HELPER_CHIPS_AUTO
          decode audio/video standards. This option will autoselect
          all pertinent modules to each selected video module.
 
-         Unselect this only if you know exaclty what you are doing, since
+         Unselect this only if you know exactly what you are doing, since
          it may break support on some boards.
 
          In doubt, say Y.
@@ -184,6 +184,14 @@ config VIDEO_KS0127
          To compile this driver as a module, choose M here: the
          module will be called ks0127.
 
+config VIDEO_OV7670
+       tristate "OmniVision OV7670 sensor support"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the OmniVision
+         OV7670 VGA camera.  It currently only works with the M88ALP01
+         controller.
+
 config VIDEO_SAA7110
        tristate "Philips SAA7110 video decoder"
        depends on VIDEO_V4L1 && I2C
@@ -334,7 +342,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
-       depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+       depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
        select VIDEO_BUF
        default n
        ---help---
@@ -567,28 +575,16 @@ config VIDEO_ZORAN_AVS6EYES
        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
-       help
-         Support for ZR36120/ZR36125 based frame grabber/overlay boards.
-         This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV,
-         and Buster boards. Please read the material in
-         <file:Documentation/video4linux/zr36120.txt> for more information.
-
-         To compile this driver as a module, choose M here: the
-         module will be called zr36120.
-
 config VIDEO_MEYE
        tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
-       depends on PCI && SONYPI && VIDEO_V4L1
+       depends on PCI && SONY_LAPTOP && VIDEO_V4L1
        ---help---
          This is the video4linux driver for the Motion Eye camera found
          in the Vaio Picturebook laptops. Please read the material in
          <file:Documentation/video4linux/meye.txt> for more information.
 
-         If you say Y or M here, you need to say Y or M to "Sony Programmable
-         I/O Control Device" in the character device section.
+         If you say Y or M here, you need to say Y or M to "Sony Laptop
+         Extras" in the misc device section.
 
          To compile this driver as a module, choose M here: the
          module will be called meye.
@@ -670,6 +666,15 @@ config VIDEO_M32R_AR_M64278
          To compile this driver as a module, choose M here: the
          module will be called arv.
 
+config VIDEO_CAFE_CCIC
+       tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
+       depends on PCI && I2C && VIDEO_V4L2
+       select VIDEO_OV7670
+       ---help---
+         This is a video4linux2 driver for the Marvell 88ALP01 integrated
+         CMOS camera controller.  This is the controller found on first-
+         generation OLPC systems.
+
 #
 # USB Multimedia device configuration
 #
@@ -681,6 +686,8 @@ source "drivers/media/video/pvrusb2/Kconfig"
 
 source "drivers/media/video/em28xx/Kconfig"
 
+source "drivers/media/video/usbvision/Kconfig"
+
 source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"