Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 7b8bb6949f5e877262312666a4991bf46c957c81..cc11c4c0e7e7afaf585e3866c0119a0601275164 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -3,9 +3,11 @@
 #
 
 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