diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:25 -0400 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /drivers/usb/serial/pl2303.h | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/pl2303.h')
| -rw-r--r-- | drivers/usb/serial/pl2303.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 54974f446a8c..1d7a22e3a9fd 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -7,6 +7,10 @@ | |||
| 7 | * (at your option) any later version. | 7 | * (at your option) any later version. |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | |||
| 11 | #define BENQ_VENDOR_ID 0x04a5 | ||
| 12 | #define BENQ_PRODUCT_ID_S81 0x4027 | ||
| 13 | |||
| 10 | #define PL2303_VENDOR_ID 0x067b | 14 | #define PL2303_VENDOR_ID 0x067b |
| 11 | #define PL2303_PRODUCT_ID 0x2303 | 15 | #define PL2303_PRODUCT_ID 0x2303 |
| 12 | #define PL2303_PRODUCT_ID_RSAQ2 0x04bb | 16 | #define PL2303_PRODUCT_ID_RSAQ2 0x04bb |