diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-07 08:30:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-07 08:30:07 -0800 |
| commit | 631007d412633b24f3495715fd73c09969f2a0f3 (patch) | |
| tree | 1d51f126f1c8f9f79223f1b560abf42182280e44 /usb | |
| parent | 538fedd93f7080b4800c6d21cd22a4ac468fa916 (diff) | |
| download | patches-631007d412633b24f3495715fd73c09969f2a0f3.tar.gz | |
2.6.24-rc7 resync
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-new-device-id-for-the-cp2101-driver.patch | 31 | ||||
| -rw-r--r-- | usb/usb-unbreak-fsl_usb2_udc.patch | 34 | ||||
| -rw-r--r-- | usb/usb-vid-pid-update-for-sierra.patch | 41 |
3 files changed, 0 insertions, 106 deletions
diff --git a/usb/usb-new-device-id-for-the-cp2101-driver.patch b/usb/usb-new-device-id-for-the-cp2101-driver.patch deleted file mode 100644 index bcee5eb41f9e1e..00000000000000 --- a/usb/usb-new-device-id-for-the-cp2101-driver.patch +++ /dev/null @@ -1,31 +0,0 @@ -From kusserow@ife.ee.ethz.ch Fri Dec 21 10:34:39 2007 -From: Martin Kusserow <kusserow@ife.ee.ethz.ch> -Date: Fri, 21 Dec 2007 12:02:17 +0100 -Subject: USB: New device ID for the CP2101 driver -To: craig@microtron.org.uk -Cc: creg@kroak.com, gregkh@suse.de -Message-ID: <476B9D39.5040702@ife.ee.ethz.ch> - -From: Martin Kusserow <kusserow@ife.ee.ethz.ch> - -attached please find a new device ID for CP2101 driver. This device is a -usb stick from Dynastream to communicate with ANT wireless devices which -I suppose is fairly similar to the ANT dev board having product id 0x1003. - -From: Martin Kusserow <kusserow@ife.ee.ethz.ch> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp2101.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp2101.c -+++ b/drivers/usb/serial/cp2101.c -@@ -55,6 +55,7 @@ static int debug; - static struct usb_device_id id_table [] = { - { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ - { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ -+ { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ - { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ - { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ - { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ diff --git a/usb/usb-unbreak-fsl_usb2_udc.patch b/usb/usb-unbreak-fsl_usb2_udc.patch deleted file mode 100644 index e2529b3713d701..00000000000000 --- a/usb/usb-unbreak-fsl_usb2_udc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From david-b@pacbell.net Fri Dec 21 09:41:23 2007 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Fri, 21 Dec 2007 08:33:46 -0800 -Subject: USB: Unbreak fsl_usb2_udc -To: Greg KH <greg@kroah.com> -Cc: Peter Korsgaard <jacmet@sunsite.dk> -Message-ID: <200712210833.46613.david-b@pacbell.net> - - -From: Peter Korsgaard <jacmet@sunsite.dk> - -Commit a4e3ef5... (USB: gadget: gadget_is_{dualspeed,otg} predicates -and cleanup) broke fsl_usb2_udc; the build test didn't cover peripheral -drivers, just gadget drivers. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/fsl_usb2_udc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/gadget/fsl_usb2_udc.c -+++ b/drivers/usb/gadget/fsl_usb2_udc.c -@@ -1318,7 +1318,7 @@ static void setup_received_irq(struct fs - | USB_TYPE_STANDARD)) { - /* Note: The driver has not include OTG support yet. - * This will be set when OTG support is added */ -- if (!gadget_is_otg(udc->gadget)) -+ if (!gadget_is_otg(&udc->gadget)) - break; - else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) - udc->gadget.b_hnp_enable = 1; diff --git a/usb/usb-vid-pid-update-for-sierra.patch b/usb/usb-vid-pid-update-for-sierra.patch deleted file mode 100644 index 26415a82f3c304..00000000000000 --- a/usb/usb-vid-pid-update-for-sierra.patch +++ /dev/null @@ -1,41 +0,0 @@ -From linux-usb-owner@vger.kernel.org Wed Dec 12 17:12:59 2007 -From: Kevin Page <linux-usb-list@krp.org.uk> -Date: Thu, 13 Dec 2007 01:10:48 +0000 -Subject: USB: VID/PID update for sierra -To: linux-usb@vger.kernel.org -Cc: Kevin Lloyd <klloyd@sierrawireless.com> -Message-ID: <1197508248.3861.19.camel@localhost.localdomain> - - -From: Kevin R Page <linux-kernel@krp.org.uk> - -Adds VID/PID for the MC8775 found internally in the Thinkpad X61s laptop -(and likely others). For commercial reasons the driver maintainer cannot -add VID/PIDs for laptop OEM devices himself. - -Signed-off-by: Kevin R Page <linux-kernel@krp.org.uk> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/sierra.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -109,6 +109,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ - { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ - { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ -+ { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */ - { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ - { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ - { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ -@@ -146,6 +147,7 @@ static struct usb_device_id id_table_3po - { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ - { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ - { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ -+ { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */ - { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ - { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ - { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ |