1 files changed, 34 insertions, 26 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index cea1763b426b..f841663dd31b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,28 +10,30 @@
 #define _DVB_USB_IDS_H_
 /* Vendor IDs */
-#define USB_VID_ADSTECH                 0x06e1
+#define USB_VID_ADSTECH                         0x06e1
-#define USB_VID_ANCHOR                  0x0547
+#define USB_VID_ANCHOR                          0x0547
-#define USB_VID_WIDEVIEW                0x14aa
+#define USB_VID_AVERMEDIA                       0x07ca
-#define USB_VID_AVERMEDIA               0x07ca
+#define USB_VID_COMPRO                          0x185b
-#define USB_VID_COMPRO                  0x185b
+#define USB_VID_COMPRO_UNK                      0x145f
-#define USB_VID_COMPRO_UNK              0x145f
+#define USB_VID_CYPRESS                         0x04b4
-#define USB_VID_CYPRESS                 0x04b4
+#define USB_VID_DIBCOM                          0x10b8
-#define USB_VID_DIBCOM                  0x10b8
+#define USB_VID_DVICO                           0x0fe9
-#define USB_VID_DVICO                   0x0fe9
+#define USB_VID_EMPIA                           0xeb1a
-#define USB_VID_EMPIA                   0xeb1a
+#define USB_VID_GENPIX                          0x09c0
-#define USB_VID_GRANDTEC                0x5032
+#define USB_VID_GRANDTEC                        0x5032
-#define USB_VID_HANFTEK                 0x15f4
+#define USB_VID_HANFTEK                         0x15f4
-#define USB_VID_HAUPPAUGE               0x2040
+#define USB_VID_HAUPPAUGE                       0x2040
-#define USB_VID_HYPER_PALTEK            0x1025
+#define USB_VID_HYPER_PALTEK                    0x1025
-#define USB_VID_KWORLD                  0xeb2a
+#define USB_VID_KWORLD                          0xeb2a
-#define USB_VID_KYE                     0x0458
+#define USB_VID_KYE                             0x0458
-#define USB_VID_MEDION                  0x1660
+#define USB_VID_LEADTEK                         0x0413
-#define USB_VID_PINNACLE                0x2304
+#define USB_VID_LITEON                          0x04ca
-#define USB_VID_VISIONPLUS              0x13d3
+#define USB_VID_MEDION                          0x1660
-#define USB_VID_TWINHAN                 0x1822
+#define USB_VID_PINNACLE                        0x2304
-#define USB_VID_ULTIMA_ELECTRONIC       0x05d8
+#define USB_VID_VISIONPLUS                      0x13d3
-#define USB_VID_LITEON                  0x04ca
+#define USB_VID_TWINHAN                         0x1822
+#define USB_VID_ULTIMA_ELECTRONIC               0x05d8
+#define USB_VID_WIDEVIEW                        0x14aa
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                       0xa333
@@ -84,12 +86,14 @@
 #define USB_PID_HANFTEK_UMT_010_WARM                    0x0015
 #define USB_PID_DTT200U_COLD                            0x0201
 #define USB_PID_DTT200U_WARM                            0x0301
-#define USB_PID_WT220U_COLD                                     0x0222
+#define USB_PID_WT220U_COLD                             0x0222
-#define USB_PID_WT220U_WARM                                     0x0221
+#define USB_PID_WT220U_WARM                             0x0221
+#define USB_PID_WT220U_FC_COLD                          0x0225
+#define USB_PID_WT220U_FC_WARM                          0x0226
 #define USB_PID_WT220U_ZL0353_COLD                      0x022a
 #define USB_PID_WT220U_ZL0353_WARM                      0x022b
-#define USB_PID_WINTV_NOVA_T_USB2_COLD          0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_COLD                  0x9300
-#define USB_PID_WINTV_NOVA_T_USB2_WARM          0x9301
+#define USB_PID_WINTV_NOVA_T_USB2_WARM                  0x9301
 #define USB_PID_NEBULA_DIGITV                           0x0201
 #define USB_PID_DVICO_BLUEBIRD_LGDT                     0xd820
 #define USB_PID_DVICO_BLUEBIRD_LG064F_COLD              0xd500
@@ -113,5 +117,9 @@
 #define USB_PID_DIGIVOX_MINI_SL_WARM                    0xe361
 #define USB_PID_GRANDTEC_DVBT_USB2_COLD                 0x0bc6
 #define USB_PID_GRANDTEC_DVBT_USB2_WARM                 0x0bc7
+#define USB_PID_WINFAST_DTV_DONGLE_COLD                 0x6025
+#define USB_PID_WINFAST_DTV_DONGLE_WARM                 0x6026
+#define USB_PID_GENPIX_8PSK_COLD                        0x0200
+#define USB_PID_GENPIX_8PSK_WARM                        0x0201
 #endif

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index cea1763b426b..f841663dd31b 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,28 +10,30 @@
10	#define _DVB_USB_IDS_H_	10	#define _DVB_USB_IDS_H_
11		11
12	/* Vendor IDs */	12	/* Vendor IDs */
13	#define USB_VID_ADSTECH 0x06e1	13	#define USB_VID_ADSTECH 0x06e1
14	#define USB_VID_ANCHOR 0x0547	14	#define USB_VID_ANCHOR 0x0547
15	#define USB_VID_WIDEVIEW 0x14aa	15	#define USB_VID_AVERMEDIA 0x07ca
16	#define USB_VID_AVERMEDIA 0x07ca	16	#define USB_VID_COMPRO 0x185b
17	#define USB_VID_COMPRO 0x185b	17	#define USB_VID_COMPRO_UNK 0x145f
18	#define USB_VID_COMPRO_UNK 0x145f	18	#define USB_VID_CYPRESS 0x04b4
19	#define USB_VID_CYPRESS 0x04b4	19	#define USB_VID_DIBCOM 0x10b8
20	#define USB_VID_DIBCOM 0x10b8	20	#define USB_VID_DVICO 0x0fe9
21	#define USB_VID_DVICO 0x0fe9	21	#define USB_VID_EMPIA 0xeb1a
22	#define USB_VID_EMPIA 0xeb1a	22	#define USB_VID_GENPIX 0x09c0
23	#define USB_VID_GRANDTEC 0x5032	23	#define USB_VID_GRANDTEC 0x5032
24	#define USB_VID_HANFTEK 0x15f4	24	#define USB_VID_HANFTEK 0x15f4
25	#define USB_VID_HAUPPAUGE 0x2040	25	#define USB_VID_HAUPPAUGE 0x2040
26	#define USB_VID_HYPER_PALTEK 0x1025	26	#define USB_VID_HYPER_PALTEK 0x1025
27	#define USB_VID_KWORLD 0xeb2a	27	#define USB_VID_KWORLD 0xeb2a
28	#define USB_VID_KYE 0x0458	28	#define USB_VID_KYE 0x0458
29	#define USB_VID_MEDION 0x1660	29	#define USB_VID_LEADTEK 0x0413
30	#define USB_VID_PINNACLE 0x2304	30	#define USB_VID_LITEON 0x04ca
31	#define USB_VID_VISIONPLUS 0x13d3	31	#define USB_VID_MEDION 0x1660
32	#define USB_VID_TWINHAN 0x1822	32	#define USB_VID_PINNACLE 0x2304
33	#define USB_VID_ULTIMA_ELECTRONIC 0x05d8	33	#define USB_VID_VISIONPLUS 0x13d3
34	#define USB_VID_LITEON 0x04ca	34	#define USB_VID_TWINHAN 0x1822
		35	#define USB_VID_ULTIMA_ELECTRONIC 0x05d8
		36	#define USB_VID_WIDEVIEW 0x14aa
35		37
36	/* Product IDs */	38	/* Product IDs */
37	#define USB_PID_ADSTECH_USB2_COLD 0xa333	39	#define USB_PID_ADSTECH_USB2_COLD 0xa333
@@ -84,12 +86,14 @@
84	#define USB_PID_HANFTEK_UMT_010_WARM 0x0015	86	#define USB_PID_HANFTEK_UMT_010_WARM 0x0015
85	#define USB_PID_DTT200U_COLD 0x0201	87	#define USB_PID_DTT200U_COLD 0x0201
86	#define USB_PID_DTT200U_WARM 0x0301	88	#define USB_PID_DTT200U_WARM 0x0301
87	#define USB_PID_WT220U_COLD 0x0222	89	#define USB_PID_WT220U_COLD 0x0222
88	#define USB_PID_WT220U_WARM 0x0221	90	#define USB_PID_WT220U_WARM 0x0221
		91	#define USB_PID_WT220U_FC_COLD 0x0225
		92	#define USB_PID_WT220U_FC_WARM 0x0226
89	#define USB_PID_WT220U_ZL0353_COLD 0x022a	93	#define USB_PID_WT220U_ZL0353_COLD 0x022a
90	#define USB_PID_WT220U_ZL0353_WARM 0x022b	94	#define USB_PID_WT220U_ZL0353_WARM 0x022b
91	#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300	95	#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300
92	#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301	96	#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301
93	#define USB_PID_NEBULA_DIGITV 0x0201	97	#define USB_PID_NEBULA_DIGITV 0x0201
94	#define USB_PID_DVICO_BLUEBIRD_LGDT 0xd820	98	#define USB_PID_DVICO_BLUEBIRD_LGDT 0xd820
95	#define USB_PID_DVICO_BLUEBIRD_LG064F_COLD 0xd500	99	#define USB_PID_DVICO_BLUEBIRD_LG064F_COLD 0xd500
@@ -113,5 +117,9 @@
113	#define USB_PID_DIGIVOX_MINI_SL_WARM 0xe361	117	#define USB_PID_DIGIVOX_MINI_SL_WARM 0xe361
114	#define USB_PID_GRANDTEC_DVBT_USB2_COLD 0x0bc6	118	#define USB_PID_GRANDTEC_DVBT_USB2_COLD 0x0bc6
115	#define USB_PID_GRANDTEC_DVBT_USB2_WARM 0x0bc7	119	#define USB_PID_GRANDTEC_DVBT_USB2_WARM 0x0bc7
		120	#define USB_PID_WINFAST_DTV_DONGLE_COLD 0x6025
		121	#define USB_PID_WINFAST_DTV_DONGLE_WARM 0x6026
		122	#define USB_PID_GENPIX_8PSK_COLD 0x0200
		123	#define USB_PID_GENPIX_8PSK_WARM 0x0201
116		124
117	#endif	125	#endif