aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-03-29 12:05:26 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-29 12:05:26 -0800
commitb2dfc44b83efab534b5a72a9ee8afe628b1a4f43 (patch)
tree0ce7f8aaafd839ff00c07d52e5d7a4050c8a7768 /usb
parentd8909fa4714f159cff6b1408bb655f203ad70703 (diff)
downloadpatches-b2dfc44b83efab534b5a72a9ee8afe628b1a4f43.tar.gz
2.6.16-git14 refresh
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-serial-dynamic-id.patch16
1 files changed, 1 insertions, 15 deletions
diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch
index aab7780a1ae00..879186b0076cc 100644
--- a/usb/usb-serial-dynamic-id.patch
+++ b/usb/usb-serial-dynamic-id.patch
@@ -17,11 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/driver.c | 37 ++++++++++++++++-------------
drivers/usb/serial/bus.c | 50 ++++++++++++++++++++++++++++++++++++++++
- drivers/usb/serial/pl2303.c | 4 +--
drivers/usb/serial/usb-serial.c | 43 +++++++++++++++++++++++++++++-----
drivers/usb/serial/usb-serial.h | 2 +
include/linux/usb.h | 13 ++++++++++
- 6 files changed, 124 insertions(+), 25 deletions(-)
+ 5 files changed, 122 insertions(+), 23 deletions(-)
---
--- gregkh-2.6.orig/drivers/usb/core/driver.c
@@ -191,19 +190,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
driver_unregister(&driver->driver);
}
---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c
-+++ gregkh-2.6/drivers/usb/serial/pl2303.c
-@@ -56,8 +56,8 @@ static struct usb_device_id id_table []
- { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
- { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
- { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
-- { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
-- { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) },
-+// { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
-+// { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) },
- { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
- { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) },
- { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) },
--- gregkh-2.6.orig/drivers/usb/serial/usb-serial.c
+++ gregkh-2.6/drivers/usb/serial/usb-serial.c
@@ -42,7 +42,7 @@