The patch titled
usb: remove duplicate IDs from option card driver
has been added to the -mm tree. Its filename is
usb-remove-duplicate-ids-from-option-card-driver.patch
*** 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
------------------------------------------------------
Subject: usb: remove duplicate IDs from option card driver
From: Ben Collins <ben.collins@xxxxxxxxxx>
Cc: Matthias Urlichs <smurf@xxxxxxxxxxxxxx>
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/option.c | 1 -
1 files changed, 1 deletion(-)
diff -puN drivers/usb/serial/option.c~usb-remove-duplicate-ids-from-option-card-driver drivers/usb/serial/option.c
--- a/drivers/usb/serial/option.c~usb-remove-duplicate-ids-from-option-card-driver
+++ a/drivers/usb/serial/option.c
@@ -165,7 +165,6 @@ static struct usb_device_id option_ids[]
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1410) }, /* Novatel U740 */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1420) }, /* Novatel EU870 */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel XU870 */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2100) }, /* Novatel EV620 CDMA/EV-DO */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */
_
Patches currently in -mm which might be from ben.collins@xxxxxxxxxx are
usb-remove-duplicate-ids-from-option-card-driver.patch
avoid-zero-size-allocation-in-cache_k8_northbridges.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
