1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index b28aa17213f5..e224722a7ff7 100644
--- a/include/media/tuner.h
+++ b/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

diff --git a/include/media/tuner.h b/include/media/tuner.h index b28aa17213f5..e224722a7ff7 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h
@@ -82,9 +82,9 @@
82	#define TUNER_PHILIPS_FM1236_MK3 43	82	#define TUNER_PHILIPS_FM1236_MK3 43
83		83
84	#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */	84	#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
85	/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */	85	/* Microtune merged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
86	#define TUNER_MICROTUNE_4049FM5 45	86	#define TUNER_MICROTUNE_4049FM5 45
87	#define TUNER_MICROTUNE_4042_FI5 46	87	#define TUNER_PANASONIC_VP27 46
88	#define TUNER_LG_NTSC_TAPE 47	88	#define TUNER_LG_NTSC_TAPE 47
89		89
90	#define TUNER_TNF_8831BGFF 48	90	#define TUNER_TNF_8831BGFF 48