diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:58 +0200 |
| commit | e765ee90da62535ac7d7a97f2464f9646539d683 (patch) | |
| tree | 7a9cecce5aab958938e9a3bf46c2302d6af1958c /drivers/usb/serial/pl2303.h | |
| parent | a4500b84c51645bbc86be3ca84f2252b7ada060f (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
| download | linux-e765ee90da62535ac7d7a97f2464f9646539d683.tar.gz linux-e765ee90da62535ac7d7a97f2464f9646539d683.tar.bz2 linux-e765ee90da62535ac7d7a97f2464f9646539d683.zip | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/usb/serial/pl2303.h')
| -rw-r--r-- | drivers/usb/serial/pl2303.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 3bdefe020501..cff160abb130 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h @@ -14,6 +14,7 @@ #define PL2303_PRODUCT_ID_PHAROS 0xaaa0 #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2 #define PL2303_PRODUCT_ID_ALDIGA 0x0611 +#define PL2303_PRODUCT_ID_MMX 0x0612 #define ATEN_VENDOR_ID 0x0557 #define ATEN_VENDOR_ID2 0x0547 |