diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 15:11:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 15:11:50 -0300 |
| commit | 486515dead96045358246b7b3cd1370ca8cb7808 (patch) | |
| tree | cc30187288969ed09f3c68c32673201509d37419 /linux/drivers/media/Kconfig | |
| parent | d8006eead13b16a2cd2fbaa0bcf07a6944798344 (diff) | |
| download | mediapointer-dvb-s2-486515dead96045358246b7b3cd1370ca8cb7808.tar.gz mediapointer-dvb-s2-486515dead96045358246b7b3cd1370ca8cb7808.tar.bz2 | |
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 'linux/drivers/media/Kconfig')
| -rw-r--r-- | linux/drivers/media/Kconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 1f7244cff..128bb9cd5 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/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" |