aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-09-07 17:33:15 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-07 17:33:15 -0700
commit60235e074196a072b9c7d25fd07c380df42cb20c (patch)
treeac6d265626dd13398187f928464ba3d4878ef96a /usb.current
parentfc53d51589bb1bfe9933fbb7de390c410c0ed927 (diff)
downloadpatches-60235e074196a072b9c7d25fd07c380df42cb20c.tar.gz
remove patches now in Linus's tree
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch91
-rw-r--r--usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch37
-rw-r--r--usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch68
-rw-r--r--usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch40
-rw-r--r--usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch29
-rw-r--r--usb.current/usb-cp210x-add-new-device-id.patch47
-rw-r--r--usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch75
-rw-r--r--usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch72
-rw-r--r--usb.current/usb-ehci-ppc-of-problems-in-unwind.patch60
-rw-r--r--usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch42
-rw-r--r--usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch58
-rw-r--r--usb.current/usb-option-fix-incorrect-novatel-entries.patch172
-rw-r--r--usb.current/usb-rndis-section-mismatch-fix.patch49
-rw-r--r--usb.current/usb-s3c-hsotg-remove-debug-define.patch29
-rw-r--r--usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch46
-rw-r--r--usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch95
-rw-r--r--usb.current/usb-ssu100-turn-off-debug-flag.patch27
17 files changed, 0 insertions, 1037 deletions
diff --git a/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch b/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch
deleted file mode 100644
index 6930f5143cdf04..00000000000000
--- a/usb.current/usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From linux-usb-owner@vger.kernel.org Wed Sep 1 13:02:44 2010
-From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
-To: linux-usb@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org,
- Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>,
- Alan Stern <stern@rowland.harvard.edu>,
- Sarah Sharp <sarah.a.sharp@linux.intel.com>,
- Greg Kroah-Hartman <gregkh@suse.de>
-Subject: usb: allow drivers to use allocated bandwidth until unbound
-Date: Sat, 28 Aug 2010 03:06:29 -0300
-Message-Id: <1282975589-22324-1-git-send-email-cascardo@holoscopio.com>
-
-When using the remove sysfs file, the device configuration is set to -1
-(unconfigured). This eventually unbind drivers with the bandwidth_mutex
-held. Some drivers may call functions that hold said mutex, like
-usb_reset_device. This is the case for rtl8187, for example. This will
-lead to the same process holding the mutex twice, which deadlocks.
-
-Besides, according to Alan Stern:
-"The deadlock problem probably could be handled somehow, but there's a
-separate issue: Until the usb_disable_device call finishes unbinding
-the drivers, the drivers are free to continue using their allocated
-bandwidth. We musn't change the bandwidth allocations until after the
-unbinding is done. So this patch is indeed necessary."
-
-Unbinding the driver before holding the bandwidth_mutex solves the
-problem. If any operation after that fails, drivers are not bound again.
-But that would be a problem anyway that the user may solve resetting the
-device configuration to one that works, just like he would need to do in
-most other failure cases.
-
-Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
-Cc: Alan Stern <stern@rowland.harvard.edu>
-Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/core/message.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
-@@ -1724,6 +1724,15 @@ free_interfaces:
- if (ret)
- goto free_interfaces;
-
-+ /* if it's already configured, clear out old state first.
-+ * getting rid of old interfaces means unbinding their drivers.
-+ */
-+ if (dev->state != USB_STATE_ADDRESS)
-+ usb_disable_device(dev, 1); /* Skip ep0 */
-+
-+ /* Get rid of pending async Set-Config requests for this device */
-+ cancel_async_set_config(dev);
-+
- /* Make sure we have bandwidth (and available HCD resources) for this
- * configuration. Remove endpoints from the schedule if we're dropping
- * this configuration to set configuration 0. After this point, the
-@@ -1733,20 +1742,11 @@ free_interfaces:
- mutex_lock(&hcd->bandwidth_mutex);
- ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);
- if (ret < 0) {
-- usb_autosuspend_device(dev);
- mutex_unlock(&hcd->bandwidth_mutex);
-+ usb_autosuspend_device(dev);
- goto free_interfaces;
- }
-
-- /* if it's already configured, clear out old state first.
-- * getting rid of old interfaces means unbinding their drivers.
-- */
-- if (dev->state != USB_STATE_ADDRESS)
-- usb_disable_device(dev, 1); /* Skip ep0 */
--
-- /* Get rid of pending async Set-Config requests for this device */
-- cancel_async_set_config(dev);
--
- ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
-@@ -1761,8 +1761,8 @@ free_interfaces:
- if (!cp) {
- usb_set_device_state(dev, USB_STATE_ADDRESS);
- usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
-- usb_autosuspend_device(dev);
- mutex_unlock(&hcd->bandwidth_mutex);
-+ usb_autosuspend_device(dev);
- goto free_interfaces;
- }
- mutex_unlock(&hcd->bandwidth_mutex);
diff --git a/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch b/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch
deleted file mode 100644
index 812dd12c87b6cc..00000000000000
--- a/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From linux-usb-owner@vger.kernel.org Wed Sep 1 18:10:45 2010
-Date: Tue, 31 Aug 2010 19:31:32 +0200
-Message-ID: <AANLkTinezH-sqVzfzCZ8qjXrmaDXuwBRvRWYSN2Jw72+@mail.gmail.com>
-Subject: USB: cdc-acm: Add pseudo modem without AT command capabilities
-From: Philippe Corbes <philippe.corbes@gmail.com>
-To: linux-usb@vger.kernel.org
-
-From: Philippe Corbes <philippe.corbes@gmail.com>
-
-cdc-acm.c : Manage pseudo-modem without AT commands capabilities
- Enable to drive electronic simple gadgets based on microcontrolers.
- The Interface descriptor is like this:
- bInterfaceClass 2 Communications
- bInterfaceSubClass 2 Abstract (modem)
- bInterfaceProtocol 0 None
-
-Signed-off-by: Philippe Corbes <philippe.corbes@gmail.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/class/cdc-acm.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1615,6 +1615,10 @@ static const struct usb_device_id acm_id
- .driver_info = NOT_A_MODEM,
- },
-
-+ /* control interfaces without any protocol set */
-+ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
-+ USB_CDC_PROTO_NONE) },
-+
- /* control interfaces with various AT-command sets */
- { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
- USB_CDC_ACM_PROTO_AT_V25TER) },
diff --git a/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch b/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch
deleted file mode 100644
index 85054c7895039b..00000000000000
--- a/usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From linux-usb-owner@vger.kernel.org Wed Sep 1 15:40:58 2010
-From: Toby Gray <toby.gray@realvnc.com>
-To: Oliver Neukum <oliver@neukum.name>
-Cc: linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com>
-Subject: USB: cdc-acm: Adding second ACM channel support for various Nokia and one Samsung phones
-Date: Wed, 1 Sep 2010 16:01:19 +0100
-Message-Id: <1283353279-18679-1-git-send-email-toby.gray@realvnc.com>
-
-S60 phones from Nokia and Samsung expose two ACM channels. The first is a modem
-with a standard AT-command interface, which is picked up correctly by CDC-ACM.
-
-The second ACM port is marked as having a vendor-specific protocol. This means
-that the ACM driver will not claim the second channel by default.
-
-This adds support for the second ACM channel for the following devices:
- Nokia E63
- Nokia E75
- Nokia 6760 Slide
- Nokia E52
- Nokia E55
- Nokia E72
- Nokia X6
- Nokia N97 Mini
- Nokia 5800 Xpressmusic
- Nokia E90
- Samsung GTi8510 (INNOV8)
-
-Signed-off-by: Toby Gray <toby.gray@realvnc.com>
-Cc: Oliver Neukum <oliver@neukum.name>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/class/cdc-acm.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1481,6 +1481,11 @@ static int acm_reset_resume(struct usb_i
- USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \
- USB_CDC_ACM_PROTO_VENDOR)
-
-+#define SAMSUNG_PCSUITE_ACM_INFO(x) \
-+ USB_DEVICE_AND_INTERFACE_INFO(0x04e7, x, \
-+ USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \
-+ USB_CDC_ACM_PROTO_VENDOR)
-+
- /*
- * USB driver structure.
- */
-@@ -1591,6 +1596,17 @@ static const struct usb_device_id acm_id
- { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */
- { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */
- { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x0178), }, /* Nokia E63 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x010e), }, /* Nokia E75 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x02d9), }, /* Nokia 6760 Slide */
-+ { NOKIA_PCSUITE_ACM_INFO(0x01d0), }, /* Nokia E52 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x0223), }, /* Nokia E72 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x0275), }, /* Nokia X6 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x026c), }, /* Nokia N97 Mini */
-+ { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */
-+ { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */
-+ { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */
-+ { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
-
- /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
-
diff --git a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch
deleted file mode 100644
index 48c80391d2dc16..00000000000000
--- a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From toby.gray@realvnc.com Thu Sep 2 13:02:31 2010
-From: Toby Gray <toby.gray@realvnc.com>
-To: Oliver Neukum <oliver@neukum.name>
-Cc: Greg Kroah-Hartman <gregkh@suse.de>, stable@kernel.org,
- linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com>
-Subject: USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors.
-Date: Thu, 2 Sep 2010 10:46:20 +0100
-Message-Id: <1283420780-13510-1-git-send-email-toby.gray@realvnc.com>
-
-Certain USB devices, such as the Nokia X6 mobile phone, don't expose any
-endpoint descriptors on some of their interfaces. If the ACM driver is forced
-to probe all interfaces on a device the a NULL pointer dereference will occur
-when the ACM driver attempts to use the endpoint of the alternative settings.
-One way to get the ACM driver to probe all the interfaces is by using the
-/sys/bus/usb/drivers/cdc_acm/new_id interface.
-
-This patch checks that the endpoint pointer for the current alternate settings
-is non-NULL before using it.
-
-Signed-off-by: Toby Gray <toby.gray@realvnc.com>
-Cc: Oliver Neukum <oliver@neukum.name>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/class/cdc-acm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interfac
- }
-
- if (!buflen) {
-- if (intf->cur_altsetting->endpoint->extralen &&
-+ if (intf->cur_altsetting->endpoint &&
-+ intf->cur_altsetting->endpoint->extralen &&
- intf->cur_altsetting->endpoint->extra) {
- dev_dbg(&intf->dev,
- "Seeking extra descriptors on endpoint\n");
diff --git a/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch b/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch
deleted file mode 100644
index 797046e959812f..00000000000000
--- a/usb.current/usb-cp210x-add-b-g-h3000-link-cable-id.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From jason.detring@navico.com Wed Sep 1 13:00:21 2010
-From: Jason Detring <jason.detring@navico.com>
-To: linux-usb@vger.kernel.org
-Cc: gregkh@suse.de, Jason Detring <jason.detring@navico.com>
-Subject: USB: cp210x: Add B&G H3000 link cable ID
-Date: Thu, 26 Aug 2010 15:08:54 -0500
-Message-Id: <1282853334-27956-2-git-send-email-jason.detring@navico.com>
-
-This is the cable between an H3000 navigation unit and a multi-function display.
-http://www.bandg.com/en/Products/H3000/Spares-and-Accessories/Cables/H3000-CPU-USB-Cable-Pack/
-
-Signed-off-by: Jason Detring <jason.detring@navico.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/cp210x.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/usb/serial/cp210x.c
-+++ b/drivers/usb/serial/cp210x.c
-@@ -88,6 +88,7 @@ static const struct usb_device_id id_tab
- { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */
- { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
- { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
-+ { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
- { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
- { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
- { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
diff --git a/usb.current/usb-cp210x-add-new-device-id.patch b/usb.current/usb-cp210x-add-new-device-id.patch
deleted file mode 100644
index 1056a7be75223c..00000000000000
--- a/usb.current/usb-cp210x-add-new-device-id.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From craig@microtron.org.uk Wed Sep 1 12:59:47 2010
-To: greg@kroah.com
-Cc: linux-usb@vger.kernel.org
-Message-Id: <1282596415287486343@teratron>
-From: Craig Shelley <craig@microtron.org.uk>
-Date: Mon, 23 Aug 2010 20:50:57 +0100
-Subject: USB: CP210x Add new device ID
-
-New device ID added for Balluff RFID reader.
-
-Signed-off-by: Craig Shelley <craig@microtron.org.uk>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/cp210x.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/serial/cp210x.c
-+++ b/drivers/usb/serial/cp210x.c
-@@ -109,6 +109,7 @@ static const struct usb_device_id id_tab
- { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */
- { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */
- { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */
-+ { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
- { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
- { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
- { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
-@@ -122,14 +123,14 @@ static const struct usb_device_id id_tab
- { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */
- { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
- { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
-- { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
-- { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
-- { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
-- { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
- { USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */
- { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */
- { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */
- { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */
-+ { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
-+ { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
-+ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
-+ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
- { } /* Terminating Entry */
- };
-
diff --git a/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch b/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch
deleted file mode 100644
index c3a79e9546e8c2..00000000000000
--- a/usb.current/usb-cp210x-usb-driver-add-usb_device-for-pirelli-dp-l10-mobile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From law_ence.dev@ntlworld.com Wed Sep 1 13:00:40 2010
-Date: Sun, 29 Aug 2010 21:51:52 +0100
-From: ael <law_ence.dev@ntlworld.com>
-To: greg@kroah.com, linux-usb@vger.kernel.org
-Subject: USB: cp210x usb driver: add USB_DEVICE for Pirelli DP-L10 mobile.
-Message-ID: <20100829205152.GB3157@exact.conquest>
-Content-Disposition: inline
-
-From: A E Lawrence <lawrence_a_e@ntlworld.com>
-
-The Pirelli DP-L10 mobile is sold under various brand names. One, already
-supported by cp210x, is the T-COM TC300. Here is the lsusb for that version:
--------------------------------------------------------------------
-Bus 001 Device 002: ID 0489:e000 Foxconn / Hon Hai T-Com TC 300
-Device Descriptor:
- bLength 18
- bDescriptorType 1
- bcdUSB 1.10
- bDeviceClass 0 (Defined at Interface level)
- bDeviceSubClass 0
- bDeviceProtocol 0
- bMaxPacketSize0 64
- idVendor 0x0489 Foxconn / Hon Hai
- idProduct 0xe000 T-Com TC 300
- bcdDevice 1.00
- iManufacturer 1 Silicon Labs
- iProduct 2 TC 300
- iSerial 3 0001
- [snip]
----------------------------------------------------------------------------
-
-However the native Pirelli DP-L10 is not supported:
-------------------------------------------------------------------
-Bus 001 Device 003: ID 0489:e003 Foxconn / Hon Hai Pirelli DP-L10
-Device Descriptor:
- bLength 18
- bDescriptorType 1
- bcdUSB 1.10
- bDeviceClass 0 (Defined at Interface level)
- bDeviceSubClass 0
- bDeviceProtocol 0
- bMaxPacketSize0 64
- idVendor 0x0489 Foxconn / Hon Hai
- idProduct 0xe003 Pirelli DP-L10
- bcdDevice 1.00
- iManufacturer 1 Silicon Labs
- iProduct 2 DP-L10
- iSerial 3 0001
- [snip]
--------------------------------------------------------------------------
-
-All that is required is an extra USB_DEVICE entry:
-
-{ USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM
-+Mobile */
-
-The patch adds that entry. Tested under 2.6.36-rc2 from git.
-
-Signed-off-by: A E Lawrence <lawrence_a_e@ntlworld.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/cp210x.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/usb/serial/cp210x.c
-+++ b/drivers/usb/serial/cp210x.c
-@@ -56,6 +56,7 @@ static int debug;
- static const struct usb_device_id id_table[] = {
- { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */
- { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
-+ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
- { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */
- { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
- { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */
diff --git a/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch b/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch
deleted file mode 100644
index 9aeeb8f2fc454a..00000000000000
--- a/usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From simon@fire.lp0.eu Wed Sep 1 15:45:04 2010
-Message-ID: <4C7E8F48.3020501@simon.arlott.org.uk>
-Date: Wed, 01 Sep 2010 18:37:12 +0100
-From: Simon Arlott <simon@fire.lp0.eu>
-To: Greg KH <greg@kroah.com>
-Subject: USB: cxacru: Use a bulk/int URB to access the command endpoint
-
-The command endpoint is either a bulk or interrupt endpoint, but using
-the wrong type of transfer causes an error if CONFIG_USB_DEBUG is
-enabled after commit f661c6f8c67bd55e93348f160d590ff9edf08904, which
-checks for this mismatch.
-
-Detect which type of endpoint it is and use a bulk/int URB as
-appropriate. There are other function calls specifying a bulk pipe,
-but usb_clear_halt doesn't use the pipe type (only the endpoint) and
-usb_bulk_msg auto-detects interrupt transfers.
-
-Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
-Cc: stable <stable@kernel.org> [.34 and newer]
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/atm/cxacru.c | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/atm/cxacru.c
-+++ b/drivers/usb/atm/cxacru.c
-@@ -1127,6 +1127,7 @@ static int cxacru_bind(struct usbatm_dat
- {
- struct cxacru_data *instance;
- struct usb_device *usb_dev = interface_to_usbdev(intf);
-+ struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD];
- int ret;
-
- /* instance init */
-@@ -1171,15 +1172,34 @@ static int cxacru_bind(struct usbatm_dat
- goto fail;
- }
-
-- usb_fill_int_urb(instance->rcv_urb,
-+ if (!cmd_ep) {
-+ dbg("cxacru_bind: no command endpoint");
-+ ret = -ENODEV;
-+ goto fail;
-+ }
-+
-+ if ((cmd_ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-+ == USB_ENDPOINT_XFER_INT) {
-+ usb_fill_int_urb(instance->rcv_urb,
- usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD),
- instance->rcv_buf, PAGE_SIZE,
- cxacru_blocking_completion, &instance->rcv_done, 1);
-
-- usb_fill_int_urb(instance->snd_urb,
-+ usb_fill_int_urb(instance->snd_urb,
- usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD),
- instance->snd_buf, PAGE_SIZE,
- cxacru_blocking_completion, &instance->snd_done, 4);
-+ } else {
-+ usb_fill_bulk_urb(instance->rcv_urb,
-+ usb_dev, usb_rcvbulkpipe(usb_dev, CXACRU_EP_CMD),
-+ instance->rcv_buf, PAGE_SIZE,
-+ cxacru_blocking_completion, &instance->rcv_done);
-+
-+ usb_fill_bulk_urb(instance->snd_urb,
-+ usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD),
-+ instance->snd_buf, PAGE_SIZE,
-+ cxacru_blocking_completion, &instance->snd_done);
-+ }
-
- mutex_init(&instance->cm_serialize);
-
diff --git a/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch b/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch
deleted file mode 100644
index 045db42a9f1fcb..00000000000000
--- a/usb.current/usb-ehci-ppc-of-problems-in-unwind.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From error27@gmail.com Wed Sep 1 12:41:29 2010
-Date: Sat, 14 Aug 2010 11:06:19 +0200
-From: Dan Carpenter <error27@gmail.com>
-To: David Brownell <dbrownell@users.sourceforge.net>
-Cc: Greg Kroah-Hartman <gregkh@suse.de>,
- Grant Likely <grant.likely@secretlab.ca>,
- Sean MacLennan <smaclennan@pikatech.com>,
- "David S. Miller" <davem@davemloft.net>, linux-usb@vger.kernel.org,
- devicetree-discuss@lists.ozlabs.org,
- Vitaly Bordug <vitb@kernel.crashing.org>,
- kernel-janitors@vger.kernel.org
-Subject: USB: ehci-ppc-of: problems in unwind
-Message-ID: <20100814090619.GY645@bicker>
-Content-Disposition: inline
-
-The iounmap(ehci->ohci_hcctrl_reg); should be the first thing we do
-because the ioremap() was the last thing we did. Also if we hit any of
-the goto statements in the original code then it would have led to a
-NULL dereference of "ehci". This bug was introduced in: 796bcae7361c
-"USB: powerpc: Workaround for the PPC440EPX USBH_23 errata [take 3]"
-
-I modified the few lines in front a little so that my code didn't
-obscure the return success code path.
-
-Signed-off-by: Dan Carpenter <error27@gmail.com>
-Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/host/ehci-ppc-of.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/host/ehci-ppc-of.c
-+++ b/drivers/usb/host/ehci-ppc-of.c
-@@ -192,17 +192,19 @@ ehci_hcd_ppc_of_probe(struct platform_de
- }
-
- rv = usb_add_hcd(hcd, irq, 0);
-- if (rv == 0)
-- return 0;
-+ if (rv)
-+ goto err_ehci;
-
-+ return 0;
-+
-+err_ehci:
-+ if (ehci->has_amcc_usb23)
-+ iounmap(ehci->ohci_hcctrl_reg);
- iounmap(hcd->regs);
- err_ioremap:
- irq_dispose_mapping(irq);
- err_irq:
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
--
-- if (ehci->has_amcc_usb23)
-- iounmap(ehci->ohci_hcctrl_reg);
- err_rmr:
- usb_put_hcd(hcd);
-
diff --git a/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch b/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch
deleted file mode 100644
index f4e0712bdef55a..00000000000000
--- a/usb.current/usb-fix-kernel-oops-with-g_ether-and-windows.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From linux-usb-owner@vger.kernel.org Wed Sep 1 12:45:40 2010
-Date: Sat, 21 Aug 2010 14:54:06 +0400
-Message-ID: <AANLkTinKBYzMwxEJarwN_HmKAORqJ7oiauj5JuXCo+rm@mail.gmail.com>
-Subject: USB: Fix kernel oops with g_ether and Windows
-From: Maxim Osipov <maxim.osipov@gmail.com>
-To: David Brownell <dbrownell@users.sourceforge.net>,
- Greg Kroah-Hartman <gregkh@suse.de>,
- Maxim Osipov <maxim.osipov@gmail.com>,
- linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
-
-
-Please find attached patch for
-https://bugzilla.kernel.org/show_bug.cgi?id=16023 problem.
-
-
-Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/rndis.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/gadget/rndis.c
-+++ b/drivers/usb/gadget/rndis.c
-@@ -293,9 +293,13 @@ gen_ndis_query_resp (int configNr, u32 O
- /* mandatory */
- case OID_GEN_VENDOR_DESCRIPTION:
- pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
-- length = strlen (rndis_per_dev_params [configNr].vendorDescr);
-- memcpy (outbuf,
-- rndis_per_dev_params [configNr].vendorDescr, length);
-+ if ( rndis_per_dev_params [configNr].vendorDescr ) {
-+ length = strlen (rndis_per_dev_params [configNr].vendorDescr);
-+ memcpy (outbuf,
-+ rndis_per_dev_params [configNr].vendorDescr, length);
-+ } else {
-+ outbuf[0] = 0;
-+ }
- retval = 0;
- break;
-
diff --git a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch
deleted file mode 100644
index 3b9ea5d45e268f..00000000000000
--- a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From luke@chamsys.co.uk Thu Sep 2 13:03:00 2010
-From: Luke Lowrey <luke@chamsys.co.uk>
-To: gregkh@suse.de
-Cc: jhovold@gmail.com, andi@lisas.de, linux-usb@vger.kernel.org,
- linux-kernel@vger.kernel.org, Luke Lowrey <luke@chamsys.co.uk>
-Subject: USB: ftdi_sio: Added custom PIDs for ChamSys products
-Date: Thu, 2 Sep 2010 11:39:49 +0100
-Message-Id: <1283423989-5710-1-git-send-email-luke@chamsys.co.uk>
-
-Added the 0xDAF8 to 0xDAFF PID range for ChamSys limited USB interface/wing products
-
-Signed-off-by: Luke Lowrey <luke@chamsys.co.uk>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c | 8 ++++++++
- drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++++++++
- 2 files changed, 20 insertions(+)
-
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -753,6 +753,14 @@ static struct usb_device_id id_table_com
- { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) },
- { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID),
- .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MIDI_TIMECODE_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MINI_WING_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) },
- { }, /* Optional parameter entry */
- { } /* Terminating entry */
- };
---- a/drivers/usb/serial/ftdi_sio_ids.h
-+++ b/drivers/usb/serial/ftdi_sio_ids.h
-@@ -135,6 +135,18 @@
- #define FTDI_NDI_AURORA_SCU_PID 0xDA74 /* NDI Aurora SCU */
-
- /*
-+ * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs
-+ */
-+#define FTDI_CHAMSYS_24_MASTER_WING_PID 0xDAF8
-+#define FTDI_CHAMSYS_PC_WING_PID 0xDAF9
-+#define FTDI_CHAMSYS_USB_DMX_PID 0xDAFA
-+#define FTDI_CHAMSYS_MIDI_TIMECODE_PID 0xDAFB
-+#define FTDI_CHAMSYS_MINI_WING_PID 0xDAFC
-+#define FTDI_CHAMSYS_MAXI_WING_PID 0xDAFD
-+#define FTDI_CHAMSYS_MEDIA_WING_PID 0xDAFE
-+#define FTDI_CHAMSYS_WING_PID 0xDAFF
-+
-+/*
- * Westrex International devices submitted by Cory Lee
- */
- #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */
diff --git a/usb.current/usb-option-fix-incorrect-novatel-entries.patch b/usb.current/usb-option-fix-incorrect-novatel-entries.patch
deleted file mode 100644
index 06d2af208f29e1..00000000000000
--- a/usb.current/usb-option-fix-incorrect-novatel-entries.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From ddeschepper@nvtl.com Wed Sep 1 12:50:22 2010
-Subject: USB: option: fix incorrect novatel entries
-Date: Tue, 24 Aug 2010 20:38:35 +0100
-From: "Dirk De Schepper" <ddeschepper@nvtl.com>
-To: gregkh@suse.de
-Message-ID: <B29F014DE7B1F949B0BC4C1EBCF29DD67B0ECB@Vectra.nvtl.local>
-
-Unfortunately some of the hardware PID belonging to auto-install CDROM
-(AICD) of Novatel modems found their way into the option module. This
-causes the AICD to be treated as a modem in stead of a disk. Since the
-modem ports do not appear until after the AICD is ejected, this
-essentially disables the modem. After a couple of minutes the AICD
-should auto-eject, but it is just too long a wait. The frequency of the
-failure seems to depend on both the hardware and the linux distribution.
-
-Here is a patch that fixes this up, and also adds a couple of new PID,
-offering some explanations and removing some incomplete and unnecessary
-comments.
-
-Signed-off-by: Dirk De Schepper <ddeschepper@nvtl.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/option.c | 119 +++++++++++++++++++++++++++-----------------
- 1 file changed, 75 insertions(+), 44 deletions(-)
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -164,6 +164,14 @@ static void option_instat_callback(struc
- #define YISO_VENDOR_ID 0x0EAB
- #define YISO_PRODUCT_U893 0xC893
-
-+/*
-+ * NOVATEL WIRELESS PRODUCTS
-+ *
-+ * Note from Novatel Wireless:
-+ * If your Novatel modem does not work on linux, don't
-+ * change the option module, but check our website. If
-+ * that does not help, contact ddeschepper@nvtl.com
-+*/
- /* MERLIN EVDO PRODUCTS */
- #define NOVATELWIRELESS_PRODUCT_V640 0x1100
- #define NOVATELWIRELESS_PRODUCT_V620 0x1110
-@@ -185,24 +193,39 @@ static void option_instat_callback(struc
- #define NOVATELWIRELESS_PRODUCT_EU730 0x2400
- #define NOVATELWIRELESS_PRODUCT_EU740 0x2410
- #define NOVATELWIRELESS_PRODUCT_EU870D 0x2420
--
- /* OVATION PRODUCTS */
- #define NOVATELWIRELESS_PRODUCT_MC727 0x4100
- #define NOVATELWIRELESS_PRODUCT_MC950D 0x4400
--#define NOVATELWIRELESS_PRODUCT_U727 0x5010
--#define NOVATELWIRELESS_PRODUCT_MC727_NEW 0x5100
--#define NOVATELWIRELESS_PRODUCT_MC760 0x6000
-+/*
-+ * Note from Novatel Wireless:
-+ * All PID in the 5xxx range are currently reserved for
-+ * auto-install CDROMs, and should not be added to this
-+ * module.
-+ *
-+ * #define NOVATELWIRELESS_PRODUCT_U727 0x5010
-+ * #define NOVATELWIRELESS_PRODUCT_MC727_NEW 0x5100
-+*/
- #define NOVATELWIRELESS_PRODUCT_OVMC760 0x6002
--
--/* FUTURE NOVATEL PRODUCTS */
--#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0X6001
--#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0X7000
--#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0X7001
--#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000
--#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001
--#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000
--#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001
--#define NOVATELWIRELESS_PRODUCT_GLOBAL 0XA001
-+#define NOVATELWIRELESS_PRODUCT_MC780 0x6010
-+#define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0x6000
-+#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0x6001
-+#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0x7000
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0x7001
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3 0x7003
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4 0x7004
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5 0x7005
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED6 0x7006
-+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED7 0x7007
-+#define NOVATELWIRELESS_PRODUCT_MC996D 0x7030
-+#define NOVATELWIRELESS_PRODUCT_MF3470 0x7041
-+#define NOVATELWIRELESS_PRODUCT_MC547 0x7042
-+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0x8000
-+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0x8001
-+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000
-+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001
-+#define NOVATELWIRELESS_PRODUCT_G1 0xA001
-+#define NOVATELWIRELESS_PRODUCT_G1_M 0xA002
-+#define NOVATELWIRELESS_PRODUCT_G2 0xA010
-
- /* AMOI PRODUCTS */
- #define AMOI_VENDOR_ID 0x1614
-@@ -490,36 +513,44 @@ static const struct usb_device_id option
- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) },
- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
- { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, /* Novatel Merlin V720/S720/PC720 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, /* Novatel U730/U740 (VF version) */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, /* Novatel U740 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, /* Novatel U870 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, /* Novatel Merlin XU870 HSDPA/3G */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, /* Novatel X950D */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727_NEW) }, /* Novatel MC727/U727/USB727 refresh */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC760) }, /* Novatel MC760/U760/USB760 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) }, /* Novatel Ovation MC760 */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */
-- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC780) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED6) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED7) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC996D) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MF3470) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) },
-+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) },
-
- { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
- { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
diff --git a/usb.current/usb-rndis-section-mismatch-fix.patch b/usb.current/usb-rndis-section-mismatch-fix.patch
deleted file mode 100644
index 892b655ff42ac2..00000000000000
--- a/usb.current/usb-rndis-section-mismatch-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From henne@nachtwindheim.de Wed Sep 1 12:44:37 2010
-From: Henrik Kretzschmar <henne@nachtwindheim.de>
-To: dbrownell@users.sourceforge.net
-Cc: gregkh@suse.de, davem@davemloft.net, eric.dumazet@gmail.com,
- henne@nachtwindheim.de, tj@kernel.org, bniebuhr@efjohnson.com,
- linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
-Subject: USB: rndis: section mismatch fix
-Date: Fri, 20 Aug 2010 19:57:50 +0200
-Message-Id: <1282327070-5100-1-git-send-email-henne@nachtwindheim.de>
-
-This patch removes the following section mismatch warning,
-by moving the function rndis_init() from .init.text to .text.
-
-WARNING: vmlinux.o(.text+0x1aeca5a): Section mismatch in reference from the function rndis_bind_config() to the function .init.text:rndis_init()
-The function rndis_bind_config() references
-the function __init rndis_init().
-This is often because rndis_bind_config lacks a __init
-annotation or the annotation of rndis_init is wrong.
-
-Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/rndis.c | 2 +-
- drivers/usb/gadget/rndis.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/gadget/rndis.c
-+++ b/drivers/usb/gadget/rndis.c
-@@ -1148,7 +1148,7 @@ static struct proc_dir_entry *rndis_conn
- #endif /* CONFIG_USB_GADGET_DEBUG_FILES */
-
-
--int __init rndis_init (void)
-+int rndis_init(void)
- {
- u8 i;
-
---- a/drivers/usb/gadget/rndis.h
-+++ b/drivers/usb/gadget/rndis.h
-@@ -262,7 +262,7 @@ int rndis_signal_disconnect (int config
- int rndis_state (int configNr);
- extern void rndis_set_host_mac (int configNr, const u8 *addr);
-
--int __devinit rndis_init (void);
-+int rndis_init(void);
- void rndis_exit (void);
-
- #endif /* _LINUX_RNDIS_H */
diff --git a/usb.current/usb-s3c-hsotg-remove-debug-define.patch b/usb.current/usb-s3c-hsotg-remove-debug-define.patch
deleted file mode 100644
index 79a2a4ede123d5..00000000000000
--- a/usb.current/usb-s3c-hsotg-remove-debug-define.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From mcuelenaere@gmail.com Wed Sep 1 12:41:09 2010
-Message-ID: <4c659d1c.487e0e0a.037b.ffffcf6a@mx.google.com>
-Date: Fri, 13 Aug 2010 21:29:30 +0200
-From: Maurus Cuelenaere <mcuelenaere@gmail.com>
-Subject: USB: s3c-hsotg: Remove DEBUG define
-To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org
-Cc: ben-linux@fluff.org, dbrownell@users.sourceforge.net,
- gregkh@suse.de
-
-DEBUG is defined unconditionally, remove it as this clutters the message log.
-
-Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/s3c-hsotg.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/usb/gadget/s3c-hsotg.c
-+++ b/drivers/usb/gadget/s3c-hsotg.c
-@@ -12,8 +12,6 @@
- * published by the Free Software Foundation.
- */
-
--#define DEBUG
--
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/spinlock.h>
diff --git a/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch b/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch
deleted file mode 100644
index 7aea088c251c8b..00000000000000
--- a/usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dave.ludlow@bay.ws Wed Sep 1 15:40:28 2010
-From: Dave Ludlow <dave.ludlow@bay.ws>
-To: gregkh@suse.de
-Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
- Dave Ludlow <dave.ludlow@bay.ws>
-Subject: usb: serial: mos7840: Add USB ID to support the B&B Electronics USOPTL4-2P.
-Date: Tue, 31 Aug 2010 14:26:17 -0400
-Message-Id: <1283279177-14379-1-git-send-email-dave.ludlow@bay.ws>
-
-Add the USB ID needed to support B&B Electronic's 2-port, optically-isolated,
-powered, USB to RS485 converter.
-
-Signed-off-by: Dave Ludlow <dave.ludlow@bay.ws>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/mos7840.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/usb/serial/mos7840.c
-+++ b/drivers/usb/serial/mos7840.c
-@@ -129,6 +129,7 @@
- #define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
- #define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
- #define BANDB_DEVICE_ID_USOPTL2_4 0xAC24
-+#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02
-
- /* This driver also supports
- * ATEN UC2324 device using Moschip MCS7840
-@@ -192,6 +193,7 @@ static const struct usb_device_id moschi
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
- {} /* terminating entry */
-@@ -209,6 +211,7 @@ static const struct usb_device_id moschi
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
- {} /* terminating entry */
diff --git a/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch b/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch
deleted file mode 100644
index 1526f84314d9b9..00000000000000
--- a/usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From linux-usb-owner@vger.kernel.org Wed Sep 1 15:43:07 2010
-From: Dave Ludlow <dave.ludlow@bay.ws>
-To: gregkh@suse.de
-Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
- Dave Ludlow <dave.ludlow@bay.ws>
-Subject: usb: serial: mos7840: Add USB IDs to support more B&B USB/RS485 converters.
-Date: Wed, 1 Sep 2010 12:33:30 -0400
-Message-Id: <1283358810-9702-1-git-send-email-dave.ludlow@bay.ws>
-
-Add the USB IDs needed to support the B&B USOPTL4-4P, USO9ML2-2P, and
-USO9ML2-4P. This patch expands and corrects a typo in the patch sent
-on 08-31-2010.
-
-Signed-off-by: Dave Ludlow <dave.ludlow@bay.ws>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/mos7840.c | 35 ++++++++++++++++++++++-------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
---- a/drivers/usb/serial/mos7840.c
-+++ b/drivers/usb/serial/mos7840.c
-@@ -119,17 +119,20 @@
- * by making a change here, in moschip_port_id_table, and in
- * moschip_id_table_combined
- */
--#define USB_VENDOR_ID_BANDB 0x0856
--#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22
--#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24
--#define BANDB_DEVICE_ID_US9ML2_2 0xAC29
--#define BANDB_DEVICE_ID_US9ML2_4 0xAC30
--#define BANDB_DEVICE_ID_USPTL4_2 0xAC31
--#define BANDB_DEVICE_ID_USPTL4_4 0xAC32
--#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
--#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
--#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24
--#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02
-+#define USB_VENDOR_ID_BANDB 0x0856
-+#define BANDB_DEVICE_ID_USO9ML2_2 0xAC22
-+#define BANDB_DEVICE_ID_USO9ML2_2P 0xBC00
-+#define BANDB_DEVICE_ID_USO9ML2_4 0xAC24
-+#define BANDB_DEVICE_ID_USO9ML2_4P 0xBC01
-+#define BANDB_DEVICE_ID_US9ML2_2 0xAC29
-+#define BANDB_DEVICE_ID_US9ML2_4 0xAC30
-+#define BANDB_DEVICE_ID_USPTL4_2 0xAC31
-+#define BANDB_DEVICE_ID_USPTL4_4 0xAC32
-+#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
-+#define BANDB_DEVICE_ID_USOPTL4_2P 0xBC02
-+#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
-+#define BANDB_DEVICE_ID_USOPTL4_4P 0xBC03
-+#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24
-
- /* This driver also supports
- * ATEN UC2324 device using Moschip MCS7840
-@@ -185,15 +188,18 @@ static const struct usb_device_id moschi
- {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
- {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
-- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
- {} /* terminating entry */
-@@ -203,15 +209,18 @@ static const struct usb_device_id moschi
- {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
- {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_US9ML2_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_2)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
-+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P)},
- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
-- {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4P)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
- {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
- {} /* terminating entry */
diff --git a/usb.current/usb-ssu100-turn-off-debug-flag.patch b/usb.current/usb-ssu100-turn-off-debug-flag.patch
deleted file mode 100644
index 64aea33b845cf6..00000000000000
--- a/usb.current/usb-ssu100-turn-off-debug-flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From wfp5p@viridian.itc.virginia.edu Wed Sep 1 13:03:28 2010
-From: Bill Pemberton <wfp5p@virginia.edu>
-To: greg@kroah.com
-Subject: USB: ssu100: turn off debug flag
-Date: Wed, 25 Aug 2010 18:21:23 -0400
-Message-Id: <1282774883-26018-1-git-send-email-wfp5p@virginia.edu>
-
-Remove the hard coding of the debug flag to 1.
-
-Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ssu100.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/serial/ssu100.c
-+++ b/drivers/usb/serial/ssu100.c
-@@ -46,7 +46,7 @@
- #define FULLPWRBIT 0x00000080
- #define NEXT_BOARD_POWER_BIT 0x00000004
-
--static int debug = 1;
-+static int debug;
-
- /* Version Information */
- #define DRIVER_VERSION "v0.1"
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:02:45 +0000