summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/option.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-06-29 14:19:11 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-06-29 14:19:11 +1000
commit4282a20a1d2e5c1be92d839c9baa4671123b4349 (patch)
tree35cb6f5d534183b4420c5ed15859f8275b0cc7a9 /drivers/usb/serial/option.c
parent3ae24f51da599ba4184aba4ac53e4b707e26f2a9 (diff)
parent838c242110497a69b67d5ff63141ae56d7589db7 (diff)
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r--drivers/usb/serial/option.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e280ad8e12f7..82c446b8c801 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -206,6 +206,7 @@ static void option_instat_callback(struct urb *urb);
#define AMOI_PRODUCT_H01 0x0800
#define AMOI_PRODUCT_H01A 0x7002
#define AMOI_PRODUCT_H02 0x0802
+#define AMOI_PRODUCT_9508 0x0800
#define DELL_VENDOR_ID 0x413C
@@ -263,9 +264,6 @@ static void option_instat_callback(struct urb *urb);
#define BANDRICH_PRODUCT_1011 0x1011
#define BANDRICH_PRODUCT_1012 0x1012
-#define AMOI_VENDOR_ID 0x1614
-#define AMOI_PRODUCT_9508 0x0800
-
#define QUALCOMM_VENDOR_ID 0x05C6
#define CMOTECH_VENDOR_ID 0x16d8