diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-27 09:32:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-27 09:32:36 -0300 |
| commit | 13e0a995ae95132a49c44b9e80e51615d84540df (patch) | |
| tree | 239597ffe6ea0a31be7d07511bdbbef0ebbe40e7 | |
| parent | b23b8ee62a10ee473cb3d84ebf620ded527fc581 (diff) | |
| download | mediapointer-dvb-s2-13e0a995ae95132a49c44b9e80e51615d84540df.tar.gz mediapointer-dvb-s2-13e0a995ae95132a49c44b9e80e51615d84540df.tar.bz2 | |
Fix Kconfig inside v4l-dvb tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Some merge error happened with those hunks. Merge them with mainstream, since
the check for GENERIC_GPIO are happening twice. Those seems to be wrong.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index f37eb6b64..de6a6208e 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -847,7 +847,7 @@ config SOC_CAMERA config SOC_CAMERA_MT9M001 tristate "mt9m001 support" - depends on SOC_CAMERA && GENERIC_GPIO + depends on SOC_CAMERA select GPIO_PCA953X if MT9M001_PCA9536_SWITCH help This driver supports MT9M001 cameras from Micron, monochrome @@ -862,7 +862,7 @@ config MT9M001_PCA9536_SWITCH config SOC_CAMERA_MT9V022 tristate "mt9v022 support" - depends on SOC_CAMERA && GENERIC_GPIO + depends on SOC_CAMERA select GPIO_PCA953X if MT9V022_PCA9536_SWITCH help This driver supports MT9V022 cameras from Micron |