diff --git a/[refs] b/[refs]
index 76ffe9d20cdb..ef37fccaac1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e08af3c30b4e5f59adff0baa33fd346227b45e2
+refs/heads/master: a80c5aa6da485da63def31442a19cdd6ff495ce6
diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
index 8cf91353b56a..7b8bb6949f5e 100644
--- a/trunk/drivers/media/Makefile
+++ b/trunk/drivers/media/Makefile
@@ -6,3 +6,6 @@ obj-y := common/
 obj-y += video/
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
+ifeq ($(CONFIG_DVB_CORE),)
+  obj-$(CONFIG_VIDEO_TUNER)  += dvb/frontends/
+endif