V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480

[safe/jmp/linux-2.6] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 82ae85c..f8fc865 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -37,10 +37,6 @@ config VIDEO_BTCX
        depends on PCI
        tristate
 
-config VIDEO_IR
-       tristate
-       depends on INPUT
-
 config VIDEO_TVEEPROM
        tristate
        depends on I2C
@@ -392,6 +388,15 @@ config VIDEO_TVP5150
          To compile this driver as a module, choose M here: the
          module will be called tvp5150.
 
+config VIDEO_TVP7002
+       tristate "Texas Instruments TVP7002 video decoder"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Texas Instruments TVP7002 video decoder.
+
+         To compile this driver as a module, choose M here: the
+         module will be called tvp7002.
+
 config VIDEO_VPX3220
        tristate "vpx3220a, vpx3216b & vpx3214c video decoders"
        depends on VIDEO_V4L2 && I2C
@@ -552,7 +557,6 @@ config VIDEO_VPSS_SYSTEM
        depends on ARCH_DAVINCI
        help
          Support for vpss system module for video driver
-       default y
 
 config VIDEO_VPFE_CAPTURE
        tristate "VPFE Video Capture Driver"
@@ -596,11 +600,24 @@ config VIDEO_DM355_CCDC
           To compile this driver as a module, choose M here: the
           module will be called vpfe.
 
+config VIDEO_ISIF
+       tristate "ISIF HW module"
+       depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
+       select VIDEO_VPSS_SYSTEM
+       default y
+       help
+          Enables ISIF hw module. This is the hardware module for
+          configuring ISIF in VPFE to capture Raw Bayer RGB data  from
+          a image sensor or YUV data from a YUV source.
+
+          To compile this driver as a module, choose M here: the
+          module will be called vpfe.
+
 source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_PMS
        tristate "Mediavision Pro Movie Studio Video For Linux"
-       depends on ISA && VIDEO_V4L1
+       depends on ISA && VIDEO_V4L2
        help
          Say Y if you have such a thing.
 
@@ -642,9 +659,14 @@ config VIDEO_W9966
          information.
 
 config VIDEO_CPIA
-       tristate "CPiA Video For Linux"
+       tristate "CPiA Video For Linux (DEPRECATED)"
        depends on VIDEO_V4L1
+       default n
        ---help---
+         This driver is DEPRECATED please use the gspca cpia1 module
+         instead. Note that you need atleast version 0.6.4 of libv4l for
+         the cpia1 gspca module.
+
          This is the video4linux driver for cameras based on Vision's CPiA
          (Colour Processor Interface ASIC), such as the Creative Labs Video
          Blaster Webcam II. If you have one of these cameras, say Y here
@@ -840,6 +862,12 @@ config SOC_CAMERA_MT9T031
        help
          This driver supports MT9T031 cameras from Micron.
 
+config SOC_CAMERA_MT9T112
+       tristate "mt9t112 support"
+       depends on SOC_CAMERA && I2C
+       help
+         This driver supports MT9T112 cameras from Aptina.
+
 config SOC_CAMERA_MT9V022
        tristate "mt9v022 support"
        depends on SOC_CAMERA && I2C
@@ -942,6 +970,8 @@ source "drivers/media/video/hdpvr/Kconfig"
 
 source "drivers/media/video/em28xx/Kconfig"
 
+source "drivers/media/video/tlg2300/Kconfig"
+
 source "drivers/media/video/cx231xx/Kconfig"
 
 source "drivers/media/video/usbvision/Kconfig"
@@ -953,6 +983,7 @@ source "drivers/media/video/et61x251/Kconfig"
 config VIDEO_OVCAMCHIP
        tristate "OmniVision Camera Chip support (DEPRECATED)"
        depends on I2C && VIDEO_V4L1
+       default n
        ---help---
          This driver is DEPRECATED please use the gspca ov519 module
          instead. Note that for the ov511 / ov518 support of the gspca module
@@ -969,6 +1000,7 @@ config VIDEO_OVCAMCHIP
 config USB_W9968CF
        tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
        depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
+       default n
        ---help---
          This driver is DEPRECATED please use the gspca ov519 module
          instead. Note that for the w9968cf support of the gspca module
@@ -990,6 +1022,7 @@ config USB_W9968CF
 config USB_OV511
        tristate "USB OV511 Camera support (DEPRECATED)"
        depends on VIDEO_V4L1
+       default n
        ---help---
          This driver is DEPRECATED please use the gspca ov519 module
          instead. Note that for the ov511 / ov518 support of the gspca module
@@ -1018,6 +1051,7 @@ source "drivers/media/video/sn9c102/Kconfig"
 config USB_STV680
        tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
        depends on VIDEO_V4L1
+       default n
        ---help---
          This driver is DEPRECATED please use the gspca stv0680 module
          instead. Note that for the gspca stv0680 module you need