diff --git a/[refs] b/[refs]
index 6d4ff34303b7..11ab9fcd0831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a0f5db8425fbcbd20e60c924c61592b2c132a6
+refs/heads/master: 174329d951e2fe39f779d67e9488b7a7f15df69c
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index cf241ab1e1b0..d579e35a1077 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/drivers/media/video/tuner-simple.c
@@ -512,7 +512,7 @@ static struct tunertype tuners[] = {
 		.UHF    = 0x30,
 		.config = 0x8e,
 	},
-	[TUNER_MICROTUNE_4042_FI5] = { /* Panasonic NTSC */
+	[TUNER_PANASONIC_VP27] = { /* Panasonic NTSC */
 		.name   = "Panasonic VP27s/ENGE4324D",
 		.thresh1= 16 * 160.00 /*MHz*/,
 		.thresh2= 16 * 454.00 /*MHz*/,
diff --git a/trunk/include/media/tuner.h b/trunk/include/media/tuner.h
index b28aa17213f5..e224722a7ff7 100644
--- a/trunk/include/media/tuner.h
+++ b/trunk/include/media/tuner.h
@@ -82,9 +82,9 @@
 #define TUNER_PHILIPS_FM1236_MK3	43
 
 #define TUNER_PHILIPS_4IN1		44	/* ATI TV Wonder Pro - Conexant */
-/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
+/* Microtune merged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
 #define TUNER_MICROTUNE_4049FM5 	45
-#define TUNER_MICROTUNE_4042_FI5	46
+#define TUNER_PANASONIC_VP27		46
 #define TUNER_LG_NTSC_TAPE		47
 
 #define TUNER_TNF_8831BGFF		48