Linux 2.6.28-rc4

[linux-2.6-omap-h63xx.git] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index cc11c4c0e7e7afaf585e3866c0119a0601275164..09a829d8a7e71a4b7b0b5de035f7034d1748e82d 100644 (file)
--- 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/