summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 12:00:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 12:00:49 -0300
commitcf2c310a0889cdeb0bc711e69833b77007717bcd (patch)
tree58fd2d9677b13ab45ee7eecf8149effbd90f9215 /linux/drivers/media/Makefile
parentb0674752e665f2b9f9b201c20341bdb326e881bb (diff)
parent3a06e7be6db2c2b35e97a92b23c9191888a07042 (diff)
downloadmediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.gz
mediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/Makefile')
-rw-r--r--linux/drivers/media/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile
index 73f742c7e..09a829d8a 100644
--- a/linux/drivers/media/Makefile
+++ b/linux/drivers/media/Makefile
@@ -2,10 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-$(CONFIG_VIDEO_MEDIA) += common/
-
-# Since hybrid devices are here, should be compiled if DVB and/or V4L
-obj-$(CONFIG_VIDEO_MEDIA) += video/
+obj-y += common/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/