---

yaml
---
r: 17295
b: refs/heads/master
c: e64a86e
h: refs/heads/master
i:
  17293: 3a5e6f3
  17291: 872fc1c
  17287: e95e48b
  17279: 57d100d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39e8f40da20a803a17e16304e73fd31050b1871c
+refs/heads/master: e64a86ee2b5ef5e23ccda2cc8981a22a8111a3b3

trunk/drivers/media/video/tveeprom.c

@@ -63,25 +63,25 @@ 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;
 	char *name;
 }
 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