X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2FMakefile;h=73f742c7e818428f1965d880a3c442e71154a957;hb=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;hp=7b8bb6949f5e877262312666a4991bf46c957c81;hpb=90768c09bca4f306c00a0cdbcb2f82601231e93e;p=linux-2.6

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 7b8bb6949f..73f742c7e8 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,10 +2,10 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y := common/
-obj-y += video/
+obj-$(CONFIG_VIDEO_MEDIA) += common/
+
+# Since hybrid devices are here, should be compiled if DVB and/or V4L
+obj-$(CONFIG_VIDEO_MEDIA) += video/
+
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
-ifeq ($(CONFIG_DVB_CORE),)
-  obj-$(CONFIG_VIDEO_TUNER)  += dvb/frontends/
-endif