summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Makefile
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/Makefile
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/Makefile')
-rw-r--r--linux/drivers/media/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile
index b6c5b35cc..73f742c7e 100644
--- a/linux/drivers/media/Makefile
+++ b/linux/drivers/media/Makefile
@@ -2,6 +2,10 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := common/
-obj-$(CONFIG_VIDEO_DEV) += radio/ video/
+obj-$(CONFIG_VIDEO_MEDIA) += common/
+
+# Since hybrid devices are here, should be compiled if DVB and/or V4L
+obj-$(CONFIG_VIDEO_MEDIA) += video/
+
+obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/