diff --git a/[refs] b/[refs]
index 45c44d44508e..7d0a6356048a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5200401ad8a80b95b3ba5636580f10adc74b6b60
+refs/heads/master: 2c9a95ba17bfe5fc24a1f782c172c03b74fcda1e
diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c
index ddd61ca3d1d0..af97a2391123 100644
--- a/trunk/drivers/staging/tm6000/tm6000-core.c
+++ b/trunk/drivers/staging/tm6000/tm6000-core.c
@@ -30,10 +30,6 @@
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 
-#ifdef HACK /* HACK */
-#include "tm6000-hack.c"
-#endif
-
 #define USB_TIMEOUT	5*HZ /* ms */
 
 int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req,
@@ -313,11 +309,6 @@ int tm6000_init (struct tm6000_core *dev)
 {
 	int board, rc=0, i;
 
-#ifdef HACK /* HACK */
-	init_tm6000(dev);
-	return 0;
-#else
-
 	/* Load board's initialization table */
 	for (i=0; i< ARRAY_SIZE(init_tab); i++) {
 		rc= tm6000_set_reg (dev, REQ_07_SET_GET_AVREG,
@@ -375,8 +366,6 @@ int tm6000_init (struct tm6000_core *dev)
 
 	msleep(50);
 
-#endif /* HACK */
-
 	return 0;
 }