Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155365
b: refs/heads/master
c: e3a3174
h: refs/heads/master
i:
  155363: 4c13d45
v: v3
  • Loading branch information
Brad Lu authored and Greg Kroah-Hartman committed Jul 12, 2009
1 parent 42564f9 commit b338af1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83dfdaa362fd9f1ed8bfa0bba50fff08c063380b
refs/heads/master: e3a3174519bae99fe3a3d3b9dfda68d820527b44
11 changes: 10 additions & 1 deletion trunk/drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,12 @@ static int option_resume(struct usb_serial *serial);
#define DLINK_VENDOR_ID 0x1186
#define DLINK_PRODUCT_DWM_652 0x3e04

#define QISDA_VENDOR_ID 0x1da5
#define QISDA_PRODUCT_H21_4512 0x4512
#define QISDA_PRODUCT_H21_4523 0x4523
#define QISDA_PRODUCT_H20_4515 0x4515
#define QISDA_PRODUCT_H20_4519 0x4519


/* TOSHIBA PRODUCTS */
#define TOSHIBA_VENDOR_ID 0x0930
Expand Down Expand Up @@ -529,7 +535,10 @@ static struct usb_device_id option_ids[] = {
{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
{ USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) },
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) },
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) },
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) },
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
{ USB_DEVICE(0x1e0e, 0x9000) },
{ } /* Terminating entry */
Expand Down

0 comments on commit b338af1

Please sign in to comment.