summaryrefslogtreecommitdiffstats
path: root/drivers/media/Makefile
diff options
context:
space:
mode:
authorJohannes Stezenbach <js@linuxtv.org>2005-09-09 13:02:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 13:57:36 -0700
commit3cc2176cbbee6adfaceac2df6d77312cf30cee83 (patch)
tree07dbe50b466a073e4e2f46448d1e3c8d662691b9 /drivers/media/Makefile
parent34f7373aaec80564cc87b7829e4e2a0e3c20c4b7 (diff)
downloadlinux-3cc2176cbbee6adfaceac2df6d77312cf30cee83.tar.bz2
[PATCH] dvb: avoid building empty built-in.o
Don't build empty built-in.o when DVB/V4L is not configured. Thanks to Sam Ravnborg and Keith Owens. Signed-off-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/Makefile')
-rw-r--r--drivers/media/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 772d6112fb3b..c578a529e7a8 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,4 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := video/ radio/ dvb/ common/
+obj-y := common/
+obj-$(CONFIG_VIDEO_DEV) += video/
+obj-$(CONFIG_VIDEO_DEV) += radio/
+obj-$(CONFIG_DVB) += dvb/