summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-30 00:02:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-30 00:02:45 -0300
commitff7dd422140de27cedcb0ce7b2af76740ef3cd11 (patch)
tree8c2c8a0806e4f8d6cb45f2cb620cd751ad7a2e57 /linux/drivers/media/Kconfig
parenteac80ab6a56ec48ce5c3b00dc03001129f3d8206 (diff)
downloadmediapointer-dvb-s2-ff7dd422140de27cedcb0ce7b2af76740ef3cd11.tar.gz
mediapointer-dvb-s2-ff7dd422140de27cedcb0ce7b2af76740ef3cd11.tar.bz2
backport tuners move patch from -git
From: Mauro Carvalho Chehab <mchehab@infradead.org> Due to the feedback I got, I've changed the -git patch. This needs to be reflected also at -hg tree. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/Kconfig')
-rw-r--r--linux/drivers/media/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index 09468d8c7..b5664927d 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -89,8 +89,15 @@ config DVB_CORE
If unsure say N.
+config VIDEO_MEDIA
+ tristate
+ default DVB_CORE || VIDEO_DEV
+ depends on DVB_CORE || VIDEO_DEV
+
comment "Multimedia drivers"
+source "drivers/media/common/Kconfig"
+
#
# Tuner drivers for DVB and V4L
#