diff options
author | Alejandro R. Sedeño <asedeno@MIT.EDU> | 2010-11-10 01:42:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-10 19:28:30 -0500 |
commit | 16618c20e18d60b2c8908b7758228a62a450769a (patch) | |
tree | 7c0400dd63aee0d9476030647876d4e412a92e87 | |
parent | b706113f1475ce983faabf12120ac4e90d512d02 (diff) |
Staging: beceem: Move ZTE TU25's USB id to the beceem module
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/bcm/InterfaceInit.c | 2 | ||||
-rw-r--r-- | drivers/staging/bcm/InterfaceInit.h | 1 | ||||
-rw-r--r-- | drivers/usb/serial/option.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c index 8a26a3ef5bd3..869ebabfba77 100644 --- a/drivers/staging/bcm/InterfaceInit.c +++ b/drivers/staging/bcm/InterfaceInit.c | |||
@@ -6,7 +6,7 @@ static struct usb_device_id InterfaceUsbtable[] = { | |||
6 | { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) }, | 6 | { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) }, |
7 | { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) }, | 7 | { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) }, |
8 | { USB_DEVICE(BCM_USB_VENDOR_ID_FOXCONN, BCM_USB_PRODUCT_ID_1901) }, | 8 | { USB_DEVICE(BCM_USB_VENDOR_ID_FOXCONN, BCM_USB_PRODUCT_ID_1901) }, |
9 | 9 | { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_TU25) }, | |
10 | { } | 10 | { } |
11 | }; | 11 | }; |
12 | MODULE_DEVICE_TABLE(usb, InterfaceUsbtable); | 12 | MODULE_DEVICE_TABLE(usb, InterfaceUsbtable); |
diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h index 3b8e17b619ba..091cf78d63a1 100644 --- a/drivers/staging/bcm/InterfaceInit.h +++ b/drivers/staging/bcm/InterfaceInit.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define BCM_USB_PRODUCT_ID_SYM 0x15E | 11 | #define BCM_USB_PRODUCT_ID_SYM 0x15E |
12 | #define BCM_USB_PRODUCT_ID_1901 0xe017 | 12 | #define BCM_USB_PRODUCT_ID_1901 0xe017 |
13 | #define BCM_USB_PRODUCT_ID_226 0x0132 | 13 | #define BCM_USB_PRODUCT_ID_226 0x0132 |
14 | #define BCM_USB_PRODUCT_ID_ZTE_TU25 0x0007 | ||
14 | 15 | ||
15 | #define BCM_USB_MINOR_BASE 192 | 16 | #define BCM_USB_MINOR_BASE 192 |
16 | 17 | ||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 2297fb1bcf65..b17896e58c5f 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -615,7 +615,6 @@ static const struct usb_device_id option_ids[] = { | |||
615 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) }, | 615 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) }, |
616 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) }, | 616 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) }, |
617 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0006, 0xff, 0xff, 0xff) }, | 617 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0006, 0xff, 0xff, 0xff) }, |
618 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0007, 0xff, 0xff, 0xff) }, | ||
619 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0008, 0xff, 0xff, 0xff) }, | 618 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0008, 0xff, 0xff, 0xff) }, |
620 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0009, 0xff, 0xff, 0xff) }, | 619 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0009, 0xff, 0xff, 0xff) }, |
621 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000a, 0xff, 0xff, 0xff) }, | 620 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000a, 0xff, 0xff, 0xff) }, |