aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/Makefile
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-05-26 14:23:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-05 06:35:42 -0300
commit45033bcf172d9965210b644f3769c9de94c33333 (patch)
tree4241fef9bd826a2f0bac027f76021d719c982c87 /drivers/media/Makefile
parent38db143e6feaa2dc649ed8bf69d1a12f7b9c0246 (diff)
V4L/DVB (7908): always enter drivers/media/video/
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 'drivers/media/Makefile')
-rw-r--r--drivers/media/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index cc11c4c0e7e..09a829d8a7e 100644
--- a/drivers/media/Makefile
+++ b/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/