[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>

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 772d6112fb3b65ea451d69ed269f57864f78319d..c578a529e7a8e910ea969b3fad2c58b28d95ca2d 100644 (file)
--- 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/