Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 37072a21d8c9b5ac97ec9a566fc004d1e07eaea7..9d3e3e50c67171009bd0762c69c99b8ed6f1f1c1 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -232,6 +232,14 @@ config VIDEO_TCM825X
          This is a driver for the Toshiba TCM825x VGA camera sensor.
          It is used for example in Nokia N800.
 
+config VIDEO_OV9640
+       tristate "OmniVision OV9640 sensor support"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         This is a Video4Linux2 sensor-level driver for the OmniVision
+         OV9640 camera.  It is currently working with the TI OMAP2
+         camera controller.
+
 config VIDEO_SAA7110
        tristate "Philips SAA7110 video decoder"
        depends on VIDEO_V4L1 && I2C
@@ -691,6 +699,8 @@ source "drivers/media/video/cx23885/Kconfig"
 
 source "drivers/media/video/ivtv/Kconfig"
 
+source drivers/media/video/omap/Kconfig
+
 config VIDEO_M32R_AR
        tristate "AR devices"
        depends on M32R && VIDEO_V4L1
@@ -719,6 +729,15 @@ config VIDEO_CAFE_CCIC
          CMOS camera controller.  This is the controller found on first-
          generation OLPC systems.
 
+config VIDEO_OMAP2
+       tristate "OMAP 2 Camera support (EXPERIMENTAL)"
+       select VIDEOBUF_GEN
+       select VIDEOBUF_DMA_SG
+       depends on VIDEO_V4L2 && ARCH_OMAP24XX
+       ---help---
+         Driver for an OMAP 2 camera controller.
+
+
 #
 # USB Multimedia device configuration
 #