From 76b9e3ce726aa842794239c2ee7242e8c36d87a0 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <pb@linuxtv.org>
Date: Tue, 19 Sep 2006 12:51:49 -0300
Subject: [PATCH] --- yaml --- r: 38241 b: refs/heads/master c:
 d535cfa776b091a95ca88ba560a9d296cb1570fd h: refs/heads/master i:   38239:
 51adcc7d3f0519992bc99fa7dca56a24fb725e12 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 ++++---
 trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h     | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4ad1412e0f3f..a1d56ad0ec35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bc636072d708287c106af15a4cd11c434c8329a
+refs/heads/master: d535cfa776b091a95ca88ba560a9d296cb1570fd
diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c b/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c
index da177e745e5e..58ecc8ff858a 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -114,6 +114,7 @@ static int stk7700p_tuner_attach(struct dvb_usb_adapter *adap)
 struct usb_device_id dib0700_usb_id_table[] = {
 		{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P) },
 		{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) },
+		{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) },
 		{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) },
 		{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) },
 		{ }		/* Terminating entry */
@@ -164,11 +165,11 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 				{ NULL },
 			},
 			{   "Hauppauge Nova-T Stick",
-				{ &dib0700_usb_id_table[2], NULL },
+				{ &dib0700_usb_id_table[3], NULL },
 				{ NULL },
 			},
 			{   "AVerMedia AVerTV DVB-T Volar",
-				{ &dib0700_usb_id_table[3], NULL },
+				{ &dib0700_usb_id_table[4], NULL },
 				{ NULL },
 			},
 		}
@@ -192,7 +193,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 		.num_device_descs = 1,
 		.devices = {
 			{   "Hauppauge Nova-T 500 Dual DVB-T",
-				{ &dib0700_usb_id_table[1], NULL },
+				{ &dib0700_usb_id_table[1], &dib0700_usb_id_table[2], NULL },
 				{ NULL },
 			},
 		}
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 415a9892391d..35bd92803730 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -95,6 +95,7 @@
 #define USB_PID_WINTV_NOVA_T_USB2_COLD			0x9300
 #define USB_PID_WINTV_NOVA_T_USB2_WARM			0x9301
 #define USB_PID_HAUPPAUGE_NOVA_T_500			0x9941
+#define USB_PID_HAUPPAUGE_NOVA_T_500_2			0x9950
 #define USB_PID_HAUPPAUGE_NOVA_T_STICK			0x7050
 #define USB_PID_AVERMEDIA_VOLAR				0x1234
 #define USB_PID_NEBULA_DIGITV				0x0201