diff --git a/[refs] b/[refs]
index ea33acd13a06..9ae0240a6ba4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3d37042d7d33baf0247d1df31031e64427f39b3
+refs/heads/master: c943aa859c392eb4cc76d911daa1f261555075b2
diff --git a/trunk/include/media/tuner-types.h b/trunk/include/media/tuner-types.h
index 9f6e4a98c40a..64b16b1f1926 100644
--- a/trunk/include/media/tuner-types.h
+++ b/trunk/include/media/tuner-types.h
@@ -9,11 +9,7 @@ enum param_type {
 	TUNER_PARAM_TYPE_RADIO, \
 	TUNER_PARAM_TYPE_PAL, \
 	TUNER_PARAM_TYPE_SECAM, \
-	TUNER_PARAM_TYPE_NTSC, \
-	TUNER_PARAM_TYPE_ATSC, \
-	TUNER_PARAM_TYPE_DVBT, \
-	TUNER_PARAM_TYPE_DVBS, \
-	TUNER_PARAM_TYPE_DVBC
+	TUNER_PARAM_TYPE_NTSC
 };
 
 struct tuner_range {