Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index aa02160..00f51dd 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -42,8 +42,30 @@ config VIDEO_TUNER
 
 config V4L2_MEM2MEM_DEV
        tristate
-       depends on VIDEOBUF_GEN
+       depends on VIDEOBUF2_CORE
 
+config VIDEOBUF2_CORE
+       tristate
+
+config VIDEOBUF2_MEMOPS
+       tristate
+
+config VIDEOBUF2_DMA_CONTIG
+       select VIDEOBUF2_CORE
+       select VIDEOBUF2_MEMOPS
+       tristate
+
+config VIDEOBUF2_VMALLOC
+       select VIDEOBUF2_CORE
+       select VIDEOBUF2_MEMOPS
+       tristate
+
+
+config VIDEOBUF2_DMA_SG
+       #depends on HAS_DMA
+       select VIDEOBUF2_CORE
+       select VIDEOBUF2_MEMOPS
+       tristate
 #
 # Multimedia Video device configuration
 #
@@ -527,7 +549,7 @@ config VIDEO_VIVI
        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
        select FONT_8x16
-       select VIDEOBUF_VMALLOC
+       select VIDEOBUF2_VMALLOC
        default n
        ---help---
          Enables a virtual video driver. This device shows a color bar
@@ -718,10 +740,30 @@ config VIDEO_VIA_CAMERA
           Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
           with ov7670 sensors.
 
+config VIDEO_NOON010PC30
+       tristate "NOON010PC30 CIF camera sensor support"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         This driver supports NOON010PC30 CIF camera from Siliconfile
+
+config VIDEO_OMAP3
+       tristate "OMAP 3 Camera support (EXPERIMENTAL)"
+       select OMAP_IOMMU
+       depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
+       ---help---
+         Driver for an OMAP 3 camera controller.
+
+config VIDEO_OMAP3_DEBUG
+       bool "OMAP 3 Camera debug messages"
+       depends on VIDEO_OMAP3
+       ---help---
+         Enable debug messages on OMAP 3 camera controller driver.
+
 config SOC_CAMERA
        tristate "SoC camera support"
        depends on VIDEO_V4L2 && HAS_DMA && I2C
        select VIDEOBUF_GEN
+       select VIDEOBUF2_CORE
        help
          SoC Camera is a common API to several cameras, not connecting
          over a bus like PCI or USB. For example some i2c camera connected
@@ -809,6 +851,12 @@ config SOC_CAMERA_OV9640
        help
          This is a ov9640 camera driver
 
+config SOC_CAMERA_OV9740
+       tristate "ov9740 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a ov9740 camera driver
+
 config MX1_VIDEO
        bool
 
@@ -827,7 +875,7 @@ config MX3_VIDEO
 config VIDEO_MX3
        tristate "i.MX3x Camera Sensor Interface driver"
        depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA
-       select VIDEOBUF_DMA_CONTIG
+       select VIDEOBUF2_DMA_CONTIG
        select MX3_VIDEO
        ---help---
          This is a v4l2 driver for the i.MX3x Camera Sensor Interface
@@ -848,7 +896,7 @@ config VIDEO_SH_MOBILE_CSI2
 config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
        depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
-       select VIDEOBUF_DMA_CONTIG
+       select VIDEOBUF2_DMA_CONTIG
        ---help---
          This is a v4l2 driver for the SuperH Mobile CEU Interface
 
@@ -967,7 +1015,7 @@ if V4L_MEM2MEM_DRIVERS
 config VIDEO_MEM2MEM_TESTDEV
        tristate "Virtual test device for mem2mem framework"
        depends on VIDEO_DEV && VIDEO_V4L2
-       select VIDEOBUF_VMALLOC
+       select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV
        default n
        ---help---
@@ -977,7 +1025,7 @@ config VIDEO_MEM2MEM_TESTDEV
 config  VIDEO_SAMSUNG_S5P_FIMC
        tristate "Samsung S5P FIMC (video postprocessor) driver"
        depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
-       select VIDEOBUF_DMA_CONTIG
+       select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help
          This is a v4l2 driver for the S5P camera interface