diff --git a/[refs] b/[refs]
index 91fdb0e01278..d628861934a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f9b1412f56eb5ec10694c27f93bd33276be0465
+refs/heads/master: 2b971af2384a11db0dbdb82e41fd9577ffaea46f
diff --git a/trunk/drivers/staging/tm6000/Makefile b/trunk/drivers/staging/tm6000/Makefile
index 9b0e5b5bf3db..294e0ce49ac9 100644
--- a/trunk/drivers/staging/tm6000/Makefile
+++ b/trunk/drivers/staging/tm6000/Makefile
@@ -4,7 +4,7 @@ tm6000-objs := tm6000-cards.o \
 		   tm6000-video.o
 
 ifeq ($(CONFIG_VIDEO_TM6000_DVB),y)
-tm6000-objs := tm6000-dvb.o \
+tm6000-objs += tm6000-dvb.o \
 		   hack.o
 endif