summaryrefslogtreecommitdiffstats
path: root/drivers/media/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-15 18:11:50 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:40 -0300
commit17de9a4e53567912735105e189535f5d83e74a81 (patch)
tree3ba441d22496b067f4d2dfe28884ee4ff9639675 /drivers/media/Kconfig
parent0b9c2b7a413c0e79254f17bbe095cee24885cd4b (diff)
downloadop-kernel-dev-17de9a4e53567912735105e189535f5d83e74a81.zip
op-kernel-dev-17de9a4e53567912735105e189535f5d83e74a81.tar.gz
V4L/DVB (7584): Fix build that occurs when CONFIG_VIDEO_PMS=y and VIDEO_V4L2_COMMON=m
This patch removes zoran checks for VIDEO_V4L2, since this API is always present, when V4L is selected. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/Kconfig')
-rw-r--r--drivers/media/Kconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 1f7244c..128bb9c 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -30,7 +30,7 @@ config VIDEO_V4L2_COMMON
depends on (I2C || I2C=n) && VIDEO_DEV
default (I2C || I2C=n) && VIDEO_DEV
-config VIDEO_V4L1
+config VIDEO_ALLOW_V4L1
bool "Enable Video For Linux API 1 (DEPRECATED)"
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMON
@@ -59,10 +59,15 @@ config VIDEO_V4L1_COMPAT
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L2
- bool
+ tristate
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMON
+config VIDEO_V4L1
+ tristate
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
+ default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
+
source "drivers/media/video/Kconfig"
source "drivers/media/radio/Kconfig"
OpenPOWER on IntegriCloud