Merge branch 'x86/irq' into x86/devel

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

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index fe743aa7f645fb611af3058775ad2b22bbd38081..5ccb0aeca8ccde50c4a605a42c3574c46358a045 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -44,6 +44,10 @@ config VIDEO_TVEEPROM
        tristate
        depends on I2C
 
+config VIDEO_TUNER
+       tristate
+       depends on MEDIA_TUNER
+
 #
 # Multimedia Video device configuration
 #
@@ -690,7 +694,7 @@ config VIDEO_MXB
        tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
        depends on PCI && VIDEO_V4L1 && I2C
        select VIDEO_SAA7146_VV
-       select MEDIA_TUNER
+       select VIDEO_TUNER
        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
@@ -789,6 +793,14 @@ menuconfig V4L_USB_DRIVERS
 
 if V4L_USB_DRIVERS && USB
 
+config USB_VIDEO_CLASS
+       tristate "USB Video Class (UVC)"
+       ---help---
+         Support for the USB Video Class (UVC).  Currently only video
+         input devices, such as webcams, are supported.
+
+         For more information see: <http://linux-uvc.berlios.de/>
+
 source "drivers/media/video/pvrusb2/Kconfig"
 
 source "drivers/media/video/em28xx/Kconfig"
@@ -897,7 +909,7 @@ endif # V4L_USB_DRIVERS
 
 config SOC_CAMERA
        tristate "SoC camera support"
-       depends on VIDEO_V4L2
+       depends on VIDEO_V4L2 && HAS_DMA
        select VIDEOBUF_DMA_SG
        help
          SoC Camera is a common API to several cameras, not connecting
@@ -906,7 +918,7 @@ config SOC_CAMERA
 
 config SOC_CAMERA_MT9M001
        tristate "mt9m001 support"
-       depends on SOC_CAMERA
+       depends on SOC_CAMERA && I2C
        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
        help
          This driver supports MT9M001 cameras from Micron, monochrome
@@ -921,7 +933,7 @@ config MT9M001_PCA9536_SWITCH
 
 config SOC_CAMERA_MT9V022
        tristate "mt9v022 support"
-       depends on SOC_CAMERA
+       depends on SOC_CAMERA && I2C
        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
        help
          This driver supports MT9V022 cameras from Micron