summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-04 07:10:49 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-04 07:10:49 -0200
commitf52b2578a8baa1467c26cc06ec6b09669f0e7d04 (patch)
treed28dc0390b12c5cbc174bf3d7517a6ed7a5a3282 /linux/drivers/media/Kconfig
parentac9fa7bdbf76e9a529779421a6d76eef93d175f7 (diff)
parent035d79af6c56bdefa3f974a15ff6306108ac5dc4 (diff)
downloadmediapointer-dvb-s2-f52b2578a8baa1467c26cc06ec6b09669f0e7d04.tar.gz
mediapointer-dvb-s2-f52b2578a8baa1467c26cc06ec6b09669f0e7d04.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/Kconfig')
-rw-r--r--linux/drivers/media/Kconfig11
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index a9de06af5..71820ef4f 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -32,9 +32,9 @@ config VIDEO_V4L2_COMMON
config VIDEO_V4L1
bool "Enable Video For Linux API 1 (DEPRECATED)"
- depends on VIDEO_DEV
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+ default VIDEO_DEV && VIDEO_V4L2_COMMON
select VIDEO_V4L1_COMPAT
- default y
---help---
Enables a compatibility API used by most V4L2 devices to allow
its usage with legacy applications that supports only V4L1 api.
@@ -44,7 +44,7 @@ config VIDEO_V4L1
config VIDEO_V4L1_COMPAT
bool "Enable Video For Linux API 1 compatible Layer"
depends on VIDEO_DEV
- default y
+ default VIDEO_DEV
---help---
This api were developed to be used at Kernel 2.2 and 2.4, but
lacks support for several video standards. There are several
@@ -60,8 +60,8 @@ config VIDEO_V4L1_COMPAT
config VIDEO_V4L2
bool
- depends on VIDEO_DEV
- default y
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+ default VIDEO_DEV && VIDEO_V4L2_COMMON
source "drivers/media/video/Kconfig"
@@ -190,7 +190,6 @@ config VIDEO_TVEEPROM
config DAB
boolean "DAB adapters"
- default y
---help---
Allow selecting support for for Digital Audio Broadcasting (DAB)
Receiver adapters.