Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / media / dvb / dvb-usb / dvb-usb-ids.h

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index feb098727dc3baa8c1452bfa8979603155400835..4d6b069536ce387575dacf11278f1d73c61862f9 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -94,8 +94,9 @@
 #define USB_PID_WT220U_ZL0353_WARM                     0x022b
 #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                   0x1234
-#define USB_PID_HAUPPAUGE_NOVA_T_STICK                 0x1234
+#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
 #define USB_PID_DVICO_BLUEBIRD_LGDT                    0xd820
@@ -105,10 +106,12 @@
 #define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM             0xdb01
 #define USB_PID_DVICO_BLUEBIRD_TH7579_COLD             0xdb10
 #define USB_PID_DVICO_BLUEBIRD_TH7579_WARM             0xdb11
-#define USB_PID_DVICO_BLUEBIRD_DEE1601_COLD            0xdb50
-#define USB_PID_DVICO_BLUEBIRD_DEE1601_WARM            0xdb51
-#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD       0xdb54
-#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM       0xdb55
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD             0xdb50
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM             0xdb51
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD             0xdb58
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM             0xdb59
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD        0xdb54
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM        0xdb55
 #define USB_PID_MEDION_MD95700                         0x0932
 #define USB_PID_KYE_DVB_T_COLD                         0x701e
 #define USB_PID_KYE_DVB_T_WARM                         0x701f