Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index c578a529e7a8e910ea969b3fad2c58b28d95ca2d..73f742c7e818428f1965d880a3c442e71154a957 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,7 +2,10 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y := common/
-obj-$(CONFIG_VIDEO_DEV) += 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)       += dvb/
+obj-$(CONFIG_DVB_CORE)  += dvb/