diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/820-usb_add_usb_find_device_by_name.patch | |
parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip |
[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.patch | 4 |
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 ee50ff90ef..6b72a47698 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); |