diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
| commit | 27a0464a6cb837d3a90b6e69365dfc01cb0dff2f (patch) | |
| tree | 361f00f4d4ad4c01b6144c52004bee2b948742ad /drivers/usb/serial/pl2303.h | |
| parent | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (diff) | |
| parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) | |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'drivers/usb/serial/pl2303.h')
| -rw-r--r-- | drivers/usb/serial/pl2303.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index a3bd039c78e9..54974f446a8c 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -110,3 +110,11 @@ | |||
| 110 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ | 110 | /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ |
| 111 | #define YCCABLE_VENDOR_ID 0x05ad | 111 | #define YCCABLE_VENDOR_ID 0x05ad |
| 112 | #define YCCABLE_PRODUCT_ID 0x0fba | 112 | #define YCCABLE_PRODUCT_ID 0x0fba |
| 113 | |||
| 114 | /* "Superial" USB - Serial */ | ||
| 115 | #define SUPERIAL_VENDOR_ID 0x5372 | ||
| 116 | #define SUPERIAL_PRODUCT_ID 0x2303 | ||
| 117 | |||
| 118 | /* Hewlett-Packard LD220-HP POS Pole Display */ | ||
| 119 | #define HP_VENDOR_ID 0x03f0 | ||
| 120 | #define HP_LD220_PRODUCT_ID 0x3524 | ||