Merge ../torvalds-2.6/

[pandora-kernel.git] / 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 bcb3419..0818996 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -12,7 +12,7 @@
 /* Vendor IDs */
 #define USB_VID_ADSTECH                                                0x06e1
 #define USB_VID_ANCHOR                                         0x0547
-#define USB_VID_AVERMEDIA_UNK                          0x14aa
+#define USB_VID_WIDEVIEW                                       0x14aa
 #define USB_VID_AVERMEDIA                                      0x07ca
 #define USB_VID_COMPRO                                         0x185b
 #define USB_VID_COMPRO_UNK                                     0x145f
@@ -24,6 +24,10 @@
 #define USB_VID_HANFTEK                                                0x15f4
 #define USB_VID_HAUPPAUGE                                      0x2040
 #define USB_VID_HYPER_PALTEK                           0x1025
+#define USB_VID_KWORLD                                         0xeb2a
+#define USB_VID_KYE                                                    0x0458
+#define USB_VID_MEDION                                         0x1660
+#define USB_VID_PINNACLE                                       0x2304
 #define USB_VID_VISIONPLUS                                     0x13d3
 #define USB_VID_TWINHAN                                                0x1822
 #define USB_VID_ULTIMA_ELECTRONIC                      0x05d8
@@ -50,12 +54,14 @@
 #define USB_PID_KWORLD_VSTREAM_WARM                    0x17df
 #define USB_PID_TWINHAN_VP7041_COLD                    0x3201
 #define USB_PID_TWINHAN_VP7041_WARM                    0x3202
+#define USB_PID_TWINHAN_VP7020_COLD                    0x3203
+#define USB_PID_TWINHAN_VP7020_WARM                    0x3204
 #define USB_PID_TWINHAN_VP7045_COLD                    0x3205
 #define USB_PID_TWINHAN_VP7045_WARM                    0x3206
-#define USB_PID_DNTV_TINYUSB2_COLD                     0x3223
-#define USB_PID_DNTV_TINYUSB2_WARM                     0x3224
 #define USB_PID_TWINHAN_VP7021_COLD                    0x3207
 #define USB_PID_TWINHAN_VP7021_WARM                    0x3208
+#define USB_PID_DNTV_TINYUSB2_COLD                     0x3223
+#define USB_PID_DNTV_TINYUSB2_WARM                     0x3224
 #define USB_PID_ULTIMA_TVBOX_COLD                      0x8105
 #define USB_PID_ULTIMA_TVBOX_WARM                      0x8106
 #define USB_PID_ULTIMA_TVBOX_AN2235_COLD       0x8107
@@ -70,6 +76,8 @@
 #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_WARM                                    0x0221
 #define USB_PID_WINTV_NOVA_T_USB2_COLD         0x9300
 #define USB_PID_WINTV_NOVA_T_USB2_WARM         0x9301
 #define USB_PID_NEBULA_DIGITV                          0x0201
@@ -78,6 +86,10 @@
 #define USB_PID_DVICO_BLUEBIRD_LGDT                    0xd820
 #define USB_PID_DVICO_BLUEBIRD_LGZ201_1                0xdb01
 #define USB_PID_DVICO_BLUEBIRD_TH7579_2                0xdb11
-
+#define USB_PID_MEDION_MD95700                         0x0932
+#define USB_PID_KYE_DVB_T_COLD                         0x701e
+#define USB_PID_KYE_DVB_T_WARM                         0x701f
+#define USB_PID_PCTV_200E                                      0x020e
+#define USB_PID_PCTV_400E                                      0x020f
 
 #endif