Pull acpi_bus_register_driver into release branch

[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 0818996..cb23904 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -43,10 +43,14 @@
 #define USB_PID_COMPRO_DVBU2000_WARM           0xd001
 #define USB_PID_COMPRO_DVBU2000_UNK_COLD       0x010c
 #define USB_PID_COMPRO_DVBU2000_UNK_WARM       0x010d
+#define USB_PID_DIBCOM_HOOK_DEFAULT                    0x0064
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM     0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                    0x0bb8
 #define USB_PID_DIBCOM_MOD3000_WARM                    0x0bb9
 #define USB_PID_DIBCOM_MOD3001_COLD                    0x0bc6
 #define USB_PID_DIBCOM_MOD3001_WARM                    0x0bc7
+#define USB_PID_DIBCOM_STK7700                         0x1e14
+#define USB_PID_DIBCOM_STK7700_REENUM          0x1e15
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD                0x2131
 #define USB_PID_GRANDTEC_DVBT_USB_COLD         0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM         0x0fa1
@@ -68,6 +72,7 @@
 #define USB_PID_ULTIMA_TVBOX_AN2235_WARM       0x8108
 #define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD       0x2235
 #define USB_PID_ULTIMA_TVBOX_USB2_COLD         0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM         0x810a
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD      0x8613
 #define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM      0x1002
 #define USB_PID_UNK_HYPER_PALTEK_COLD          0x005e
@@ -78,14 +83,22 @@
 #define USB_PID_DTT200U_WARM                           0x0301
 #define USB_PID_WT220U_COLD                                    0x0222
 #define USB_PID_WT220U_WARM                                    0x0221
+#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_WARM         0x9301
 #define USB_PID_NEBULA_DIGITV                          0x0201
-#define USB_PID_DVICO_BLUEBIRD_LGZ201          0xdb00
-#define USB_PID_DVICO_BLUEBIRD_TH7579          0xdb10
 #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_DVICO_BLUEBIRD_LG064F_COLD             0xd500
+#define USB_PID_DVICO_BLUEBIRD_LG064F_WARM             0xd501
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_COLD             0xdb00
+#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_MEDION_MD95700                         0x0932
 #define USB_PID_KYE_DVB_T_COLD                         0x701e
 #define USB_PID_KYE_DVB_T_WARM                         0x701f