From 6789120fe6cdb5a67c1d83a1c4c32535880df845 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@hauppauge.com>
Date: Mon, 9 Jan 2006 15:25:16 -0200
Subject: [PATCH] --- yaml --- r: 17295 b: refs/heads/master c:
 e64a86ee2b5ef5e23ccda2cc8981a22a8111a3b3 h: refs/heads/master i:   17293:
 3a5e6f3fd7aa788ea1b4773a369abd54fd964eba   17291:
 872fc1c5a6ac5c21f758b88a002f3c82a18ba10d   17287:
 e95e48b185456e7badd68c102956bb98ea694c3e   17279:
 57d100dc3e93dbe8e3ee93593929c0611dcaf1ee v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/media/video/tveeprom.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4ad501a894c9..10b1ecdf7008 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39e8f40da20a803a17e16304e73fd31050b1871c
+refs/heads/master: e64a86ee2b5ef5e23ccda2cc8981a22a8111a3b3
diff --git a/trunk/drivers/media/video/tveeprom.c b/trunk/drivers/media/video/tveeprom.c
index 8ac4cb82a459..a26ce7515dfa 100644
--- a/trunk/drivers/media/video/tveeprom.c
+++ b/trunk/drivers/media/video/tveeprom.c
@@ -63,10 +63,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 		printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
 			c->adapter->nr, c->addr , ##arg); } while (0)
 
-
-/* ----------------------------------------------------------------------- */
-/* some hauppauge specific stuff                                           */
-
+/*
+ * The Hauppauge eeprom uses an 8bit field to determine which
+ * tuner formats the tuner supports.
+ */
 static struct HAUPPAUGE_TUNER_FMT
 {
 	int	id;
@@ -74,14 +74,14 @@ static struct HAUPPAUGE_TUNER_FMT
 }
 hauppauge_tuner_fmt[] =
 {
-	{ 0x00000000, " unknown1" },
-	{ 0x00000000, " unknown2" },
-	{ 0x00000007, " PAL(B/G)" },
-	{ 0x00001000, " NTSC(M)" },
-	{ 0x00000010, " PAL(I)" },
-	{ 0x00400000, " SECAM(L/L')" },
-	{ 0x00000e00, " PAL(D/K)" },
-	{ 0x03000000, " ATSC/DVB Digital" },
+	{ V4L2_STD_UNKNOWN," UNKNOWN" },
+	{ V4L2_STD_UNKNOWN," FM" },
+	{ V4L2_STD_PAL_BG, " PAL(B/G)" },
+	{ V4L2_STD_NTSC_M, " NTSC(M)" },
+	{ V4L2_STD_PAL_I,  " PAL(I)" },
+	{ V4L2_STD_SECAM_L," SECAM(L/L')" },
+	{ V4L2_STD_PAL_DK, " PAL(D/D1/K)" },
+	{ V4L2_STD_ATSC,   " ATSC/DVB Digital" },
 };
 
 /* This is the full list of possible tuners. Many thanks to Hauppauge for