diff --git a/[refs] b/[refs]
index 929ceb9930b2..41c0732b31ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e1bf9ffb1aca693e3cf4a4f7144c8f70c8a08b0
+refs/heads/master: f7c83a0aaa772f8d0189fa197d77c762caaa367a
diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
index 73f742c7e818..cc11c4c0e7e7 100644
--- a/trunk/drivers/media/Makefile
+++ b/trunk/drivers/media/Makefile
@@ -2,6 +2,8 @@
 # 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