X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2FMakefile;h=09a829d8a7e71a4b7b0b5de035f7034d1748e82d;hb=db6d8c7a4027b48d797b369a53f8470aaeed7063;hp=cc11c4c0e7e7afaf585e3866c0119a0601275164;hpb=63fe46da9c380b3f2bbdf3765044649517cc717c;p=linux-2.6

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index cc11c4c0e7..09a829d8a7 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/