commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=d42738ac409d81636c3bd0912c44ecc86e99e0be branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
This file is merged by mistake when update to linux 3.4. Signed-off-by: Scott Jiang <[email protected]> --- drivers/media/video/Kconfig | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 7666cc1..abdf8a2 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -293,16 +293,6 @@ config VIDEO_ADV7842 To compile this driver as a module, choose M here: the module will be called adv7842. -config VIDEO_ADV7183 - tristate "Analog Devices ADV7183 decoder" - depends on VIDEO_V4L2 && I2C - ---help--- - V4l2 subdevice driver for the Analog Devices - ADV7183 video decoder. - - To compile this driver as a module, choose M here: the - module will be called adv7183. - config VIDEO_BT819 tristate "BT819A VideoStream decoder" depends on VIDEO_V4L2 && I2C @@ -522,16 +512,6 @@ config VIDEO_VS6624 To compile this driver as a module, choose M here: the module will be called vs6624. -config VIDEO_VS6624 - tristate "ST VS6624 sensor support" - depends on VIDEO_V4L2 && I2C - ---help--- - This is a Video4Linux2 sensor-level driver for the ST VS6624 - camera. - - To compile this driver as a module, choose M here: the - module will be called vs6624. - config VIDEO_MT9M032 tristate "MT9M032 camera sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API @@ -977,8 +957,6 @@ config VIDEO_VINO Say Y here to build in support for the Vino video input system found on SGI Indy machines. -source "drivers/media/video/blackfin/Kconfig" - config VIDEO_M32R_AR tristate "AR devices" depends on M32R && VIDEO_V4L2
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
