summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
commiteb0c0200624c487af549aca9eddb722413dbc1cd (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
parent8b3c85ca8244eec0d01eea269922d780f73ccebb (diff)
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch')
-rw-r--r--target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
index ee50ff90e..6b72a4769 100644
--- a/target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
+++ b/target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -652,6 +652,71 @@ int __usb_get_extra_descriptor(char *buf
+@@ -653,6 +653,71 @@ int __usb_get_extra_descriptor(char *buf
}
EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
@@ -74,7 +74,7 @@
* @dev: device the buffer will be used with
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -531,6 +531,7 @@ extern int usb_lock_device_for_reset(str
+@@ -584,6 +584,7 @@ extern int usb_lock_device_for_reset(str
extern int usb_reset_device(struct usb_device *dev);
extern void usb_queue_reset_device(struct usb_interface *dev);