summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:23:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:23:49 -0300
commit05da578ca1e11f37b78f9821a7c26dcd603fb5bb (patch)
tree8d7a72d5c486efb0ae2d57fe49942ad926e5b764 /linux/drivers/media/Makefile
parent7ac2a0cdca5bb0c9c31c2691c298becb8d777077 (diff)
downloadmediapointer-dvb-s2-05da578ca1e11f37b78f9821a7c26dcd603fb5bb.tar.gz
mediapointer-dvb-s2-05da578ca1e11f37b78f9821a7c26dcd603fb5bb.tar.bz2
always enter drivers/media/video/
From: Adrian Bunk <bunk@kernel.org> After commit 039d40019f3c5e26ea50ec5af4270189f63365e1 (V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic) VIDEO_MEDIA is no longer usable in Makefile's for deciding which directories we enter, resulting in compile errors like the following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m: <-- snip --> ... MODPOST 187 modules ... make[2]: *** [__modpost] Error 1 <-- snip --> The easiest solution is to always enter video/ Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/Makefile')
-rw-r--r--linux/drivers/media/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile
index cc11c4c0e..09a829d8a 100644
--- a/linux/drivers/media/Makefile
+++ b/linux/drivers/media/Makefile
@@ -2,12 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := common/
-
-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/