kernel/3.10: backport of_pci_get_devfn function from 3.11

[openwrt.git] / target / linux / generic / patches-3.6 / 060-hso_devices.patch

diff --git a/target/linux/generic/patches-3.6/060-hso_devices.patch b/target/linux/generic/patches-3.6/060-hso_devices.patch
index 9b15c757213c075c41baf99f497fb5ab5b3dfb98..0080bd58b7b3c590098164f9a274f526013c213a 100644 (file)
--- a/target/linux/generic/patches-3.6/060-hso_devices.patch
+++ b/target/linux/generic/patches-3.6/060-hso_devices.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/hso.c
 +++ b/drivers/net/usb/hso.c
-@@ -476,8 +476,10 @@ static const struct usb_device_id hso_id
+@@ -468,8 +468,10 @@ static const struct usb_device_id hso_id
        {USB_DEVICE(0x0af0, 0x8400)},
        {USB_DEVICE(0x0af0, 0x8600)},
        {USB_DEVICE(0x0af0, 0x8800)},
@@ -15,7 +15,7 @@
        {USB_DEVICE(0x0af0, 0xd155)},
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -1231,6 +1231,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1237,6 +1237,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                0 ),