diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 15:53:16 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 15:53:16 -0300 |
commit | b8cd0ea01c96add07515f70e3bf4ceb549032ab8 (patch) | |
tree | 895027f4787a2a96056ddb871ebc02b64f2a234e /linux/drivers/media/video/Kconfig | |
parent | 3e5ef6c96971ef08a522d760ebe16e06b1ed18f2 (diff) | |
parent | 047be70f142ed0c8f8a02e92d64200104a94e49d (diff) | |
download | mediapointer-dvb-s2-b8cd0ea01c96add07515f70e3bf4ceb549032ab8.tar.gz mediapointer-dvb-s2-b8cd0ea01c96add07515f70e3bf4ceb549032ab8.tar.bz2 |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
-rw-r--r-- | linux/drivers/media/video/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 72b2cd81f..98e2e1a2a 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -898,7 +898,6 @@ endif # V4L_USB_DRIVERS config SOC_CAMERA tristate "SoC camera support" depends on VIDEO_V4L2 - depends on I2C select VIDEOBUF_DMA_SG help SoC Camera is a common API to several cameras, not connecting @@ -907,7 +906,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 @@ -922,7 +921,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 |