The patch titled
usb: serial: move zte MF330 from sierra to option
has been added to the -mm tree. Its filename is
usb-serial-move-zte-mf330-from-sierra-to-option.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: usb: serial: move zte MF330 from sierra to option
From: Kevin Lloyd <linux@xxxxxxxxxxxxxxxxxx>
Move the Onda H600/ZTE MF33 device from the sierra driver to the option
driver.
Signed-off-by: Kevin Lloyd <klloyd@xxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/option.c | 3 +++
drivers/usb/serial/sierra.c | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/usb/serial/option.c~usb-serial-move-zte-mf330-from-sierra-to-option drivers/usb/serial/option.c
--- a/drivers/usb/serial/option.c~usb-serial-move-zte-mf330-from-sierra-to-option
+++ a/drivers/usb/serial/option.c
@@ -121,6 +121,8 @@ static int option_send_setup(struct usb
#define BANDRICH_PRODUCT_C100_1 0x1002
#define BANDRICH_PRODUCT_C100_2 0x1003
+#define QUALCOMM_VENDOR_ID 0x05C6
+
static struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -187,6 +189,7 @@ static struct usb_device_id option_ids[]
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
+ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, option_ids);
diff -puN drivers/usb/serial/sierra.c~usb-serial-move-zte-mf330-from-sierra-to-option drivers/usb/serial/sierra.c
--- a/drivers/usb/serial/sierra.c~usb-serial-move-zte-mf330-from-sierra-to-option
+++ a/drivers/usb/serial/sierra.c
@@ -178,7 +178,6 @@ static struct usb_device_id id_table []
{ USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */
{ USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */
- { USB_DEVICE(0x05C6, 0x6613), .driver_info = DEVICE_1_PORT }, /* Onda H600/ZTE MF330 */
{ USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
{ }
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are
usb-serial-move-zte-mf330-from-sierra-to-option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
