X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2FMakefile;h=09a829d8a7e71a4b7b0b5de035f7034d1748e82d;hb=97ae60bb38279e1941c738b1037a57e6b14efeaf;hp=cc11c4c0e7e7afaf585e3866c0119a0601275164;hpb=1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5;p=linux-2.6-omap-h63xx.git

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/