diff --git a/[refs] b/[refs]
index 4f4ba159740c..8ebd60cd6ad1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbc947ce157dbed5e036a2115cf5360c24aea0e
+refs/heads/master: 7231f49a67d28c93505627c7ee6485a75bd517b5
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index 199cc86f0853..19120edd5dc3 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -396,8 +396,6 @@ struct tm6000_board tm6000_boards[] = {
 			.has_eeprom     = 1,
 			.has_remote     = 1,
 			.has_radio	= 1.
-			.has_input_comp = 1,
-			.has_input_svid = 1,
 		},
 		.gpio = {
 			.tuner_reset	= TM6010_GPIO_0,
@@ -435,8 +433,6 @@ struct tm6000_board tm6000_boards[] = {
 			.has_eeprom     = 1,
 			.has_remote     = 1,
 			.has_radio	= 1,
-			.has_input_comp = 1,
-			.has_input_svid = 1,
 		},
 		.gpio = {
 			.tuner_reset	= TM6010_GPIO_0,
@@ -568,8 +564,6 @@ struct tm6000_board tm6000_boards[] = {
 			.has_eeprom     = 1,
 			.has_remote     = 0,
 			.has_radio	= 1,
-			.has_input_comp = 0,
-			.has_input_svid = 0,
 		},
 		.gpio = {
 			.tuner_reset	= TM6010_GPIO_0,
@@ -599,8 +593,6 @@ struct tm6000_board tm6000_boards[] = {
 			.has_eeprom     = 1,
 			.has_remote     = 0,
 			.has_radio	= 1,
-			.has_input_comp = 0,
-			.has_input_svid = 0,
 		},
 		.gpio = {
 			.tuner_reset	= TM6010_GPIO_0,
diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h
index e4ca8968451f..ae6369b9a90c 100644
--- a/trunk/drivers/staging/tm6000/tm6000.h
+++ b/trunk/drivers/staging/tm6000/tm6000.h
@@ -143,8 +143,6 @@ struct tm6000_capabilities {
 	unsigned int    has_eeprom:1;
 	unsigned int    has_remote:1;
 	unsigned int    has_radio:1;
-	unsigned int    has_input_comp:1;
-	unsigned int    has_input_svid:1;
 };
 
 struct tm6000_dvb {