diff -Nru linux-2.6.16-gentoo-r8/drivers/media/video/tuner-types.c linux-2.6.16-gentoo-r8.new/drivers/media/video/tuner-types.c
--- linux-2.6.16-gentoo-r8/drivers/media/video/tuner-types.c	2006-06-08 01:06:32.000000000 +0200
+++ linux-2.6.16-gentoo-r8.new/drivers/media/video/tuner-types.c	2006-06-08 01:03:07.836374250 +0200
@@ -1084,22 +1084,37 @@
 };
 
 /* 70-79 */
-/* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */
+/* ------------ TUNER_SAMSUNG_TCPN_2221P30A - Samsung NTSC ------------ */
 
-static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = {
+static struct tuner_range tuner_samsung_tcpn_2221p30a_ntsc_ranges[] = {
 	{ 16 * 130.00 /*MHz*/, 0x01, },
 	{ 16 * 364.50 /*MHz*/, 0x02, },
 	{ 16 * 999.99        , 0x08, },
 };
 
-static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
+static struct tuner_params tuner_samsung_tcpn_2221p30a_params[] = {
 	{
 		.type   = TUNER_PARAM_TYPE_NTSC,
-		.ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges,
-		.count  = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges),
+		.ranges = tuner_samsung_tcpn_2221p30a_ntsc_ranges,
+		.count  = ARRAY_SIZE(tuner_samsung_tcpn_2221p30a_ntsc_ranges),
 		.config = 0xce,
 	},
 };
+/* ------------ TUNER_SAMSUNG_TCPG_6221P30A - Samsung PAL ------------ */
+static struct tuner_range tuner_samsung_tcpg_6221p30a_pal_ranges[] = {
+	{ 16 * 146.25 /*Mhz*/, 0x01 },
+	{ 16 * 428.50 /*Mhz*/, 0x02 },
+	{ 16 * 999.99        , 0x08 },
+};
+
+static struct tuner_params tuner_samsung_tcpg_6221p30a_params[] = {
+	{
+		.type   = TUNER_PARAM_TYPE_PAL,
+		.ranges = tuner_samsung_tcpg_6221p30a_pal_ranges,
+		.count  = ARRAY_SIZE(tuner_samsung_tcpg_6221p30a_pal_ranges),
+		.config = 0xce,
+	}
+};
 
 /* --------------------------------------------------------------------- */
 
@@ -1397,9 +1412,13 @@
 	},
 
 	/* 70-79 */
-	[TUNER_SAMSUNG_TCPN_2121P30A] = { /* Samsung NTSC */
-		.name   = "Samsung TCPN 2121P30A",
-		.params = tuner_samsung_tcpn_2121p30a_params,
+	[TUNER_SAMSUNG_TCPN_2221P30A] = { /* Samsung NTSC */
+		.name   = "Samsung TCPN 2221P30A",
+		.params = tuner_samsung_tcpn_2221p30a_params,
+	},
+	[TUNER_SAMSUNG_TCPG_6221P30A] = { /* Samsung PAL */
+		.name   = "Samsung TCPG 6221P30A",
+		.params = tuner_samsung_tcpg_6221p30a_params,
 	},
 };
 
diff -Nru linux-2.6.16-gentoo-r8/drivers/media/video/tveeprom.c linux-2.6.16-gentoo-r8.new/drivers/media/video/tveeprom.c
--- linux-2.6.16-gentoo-r8/drivers/media/video/tveeprom.c	2006-06-08 01:06:32.000000000 +0200
+++ linux-2.6.16-gentoo-r8.new/drivers/media/video/tveeprom.c	2006-06-07 21:09:02.407357250 +0200
@@ -190,7 +190,7 @@
 	{ TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
 	{ TUNER_TCL_2002N,     "TCL 2002N 6A"},
 	{ TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"},
-	{ TUNER_SAMSUNG_TCPN_2121P30A, "Samsung TCPN 2121P30A"},
+	{ TUNER_SAMSUNG_TCPN_2221P30A, "Samsung TCPN 2221P30A"},
 	{ TUNER_ABSENT,        "Samsung TCPE 4121P30A"},
 	{ TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"},
 	/* 90-99 */
@@ -200,7 +200,7 @@
 	{ TUNER_ABSENT,        "Philips FQ1286A MK4"},
 	{ TUNER_ABSENT,        "Philips FQ1216ME MK5"},
 	{ TUNER_ABSENT,        "Philips FQ1236 MK5"},
-	{ TUNER_ABSENT,        "Samsung TCPG_6121P30A"},
+	{ TUNER_SAMSUNG_TCPG_6221P30A, "Samsung TCPG 6221P30A"},
 	{ TUNER_TCL_2002MB,    "TCL 2002MB_3H"},
 	{ TUNER_ABSENT,        "TCL 2002MI_3H"},
 	{ TUNER_TCL_2002N,     "TCL 2002N 5H"},
diff -Nru linux-2.6.16-gentoo-r8/include/media/tuner.h linux-2.6.16-gentoo-r8.new/include/media/tuner.h
--- linux-2.6.16-gentoo-r8/include/media/tuner.h	2006-06-08 01:06:32.000000000 +0200
+++ linux-2.6.16-gentoo-r8.new/include/media/tuner.h	2006-06-07 21:28:23.995952000 +0200
@@ -115,7 +115,8 @@
 
 #define TUNER_PHILIPS_TUV1236D		68	/* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69	/* Sabrent Bt848   */
-#define TUNER_SAMSUNG_TCPN_2121P30A     70 	/* Hauppauge PVR-500MCE NTSC */
+#define TUNER_SAMSUNG_TCPN_2221P30A     70 	/* Hauppauge PVR-500MCE NTSC */
+#define TUNER_SAMSUNG_TCPG_6221P30A	71	/* Hauppauge PVR-500MCE PAL */
 
 /* tv card specific */
 #define TDA9887_PRESENT 		(1<<0)