diff --git a/[refs] b/[refs]
index 66d8fb4f2976..dec6f15f6fc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a40231a67c443c5913366a45e9fc3da20a798790
+refs/heads/master: 8dd4eddaf7b2acbc4b7aa097d0e2b373e519e97b
diff --git a/trunk/drivers/staging/tm6000/tm6000-i2c.c b/trunk/drivers/staging/tm6000/tm6000-i2c.c
index 79bc67f0311f..ba932593db20 100644
--- a/trunk/drivers/staging/tm6000/tm6000-i2c.c
+++ b/trunk/drivers/staging/tm6000/tm6000-i2c.c
@@ -32,8 +32,6 @@
 #include "tuner-xc2028.h"
 
 
-/*FIXME: Hack to avoid needing to patch i2c-id.h */
-#define I2C_HW_B_TM6000 I2C_HW_B_EM28XX
 /* ----------------------------------------------------------- */
 
 static unsigned int i2c_debug = 0;
@@ -324,7 +322,6 @@ static struct i2c_adapter tm6000_adap_template = {
 	.owner = THIS_MODULE,
 	.class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
 	.name = "tm6000",
-	.id = I2C_HW_B_TM6000,
 	.algo = &tm6000_algo,
 };