diff --git a/[refs] b/[refs]
index f67f91568158..c44fd5ae6e93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: defeb0b94b6acf929e82b66dbc1fcb48b9204c70
+refs/heads/master: bb65242aa374e7ebcd32672bc9a0b890bd9117bb
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index e6c876f3a35a..7483c1746079 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -50,6 +50,7 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = {
 	{ .module_id = PVR2_CLIENT_ID_SAA7115 },
 	{ .module_id = PVR2_CLIENT_ID_MSP3400 },
 	{ .module_id = PVR2_CLIENT_ID_TUNER },
+	{ .module_id = PVR2_CLIENT_ID_DEMOD },
 };
 
 static const char *pvr2_fw1_names_29xxx[] = {
@@ -81,6 +82,7 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = {
 	{ .module_id = PVR2_CLIENT_ID_CX25840 },
 	{ .module_id = PVR2_CLIENT_ID_TUNER },
 	{ .module_id = PVR2_CLIENT_ID_WM8775 },
+	{ .module_id = PVR2_CLIENT_ID_DEMOD },
 };
 
 static const char *pvr2_fw1_names_24xxx[] = {
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index ed9cdedcc71b..13a59c4f9584 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -40,6 +40,7 @@
 #define PVR2_CLIENT_ID_TUNER 4
 #define PVR2_CLIENT_ID_CS53L32A 5
 #define PVR2_CLIENT_ID_WM8775 6
+#define PVR2_CLIENT_ID_DEMOD 7
 
 struct pvr2_device_client_desc {
 	/* One ovr PVR2_CLIENT_ID_xxxx */
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7c66779b1f42..b8a2d332c6d0 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -123,6 +123,7 @@ static const char *module_names[] = {
 	[PVR2_CLIENT_ID_CX25840] = "cx25840",
 	[PVR2_CLIENT_ID_SAA7115] = "saa7115",
 	[PVR2_CLIENT_ID_TUNER] = "tuner",
+	[PVR2_CLIENT_ID_DEMOD] = "tuner",
 	[PVR2_CLIENT_ID_CS53L32A] = "cs53l32a",
 	[PVR2_CLIENT_ID_WM8775] = "wm8775",
 };
@@ -130,6 +131,7 @@ static const char *module_names[] = {
 
 static const unsigned char *module_i2c_addresses[] = {
 	[PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63",
+	[PVR2_CLIENT_ID_DEMOD] = "\x43",
 	[PVR2_CLIENT_ID_MSP3400] = "\x40",
 	[PVR2_CLIENT_ID_SAA7115] = "\x21",
 	[PVR2_CLIENT_ID_WM8775] = "\x1b",