kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / octeon / patches-3.14 / 120-octeon_platform_usb.patch

diff --git a/target/linux/octeon/patches-3.14/120-octeon_platform_usb.patch b/target/linux/octeon/patches-3.14/120-octeon_platform_usb.patch
index 2137b4733eef6b13458fe64912b1c57ced0de2b2..7cffaf621f30bcae59b8ad5590acc9b67e67ad66 100644 (file)
--- a/target/linux/octeon/patches-3.14/120-octeon_platform_usb.patch
+++ b/target/linux/octeon/patches-3.14/120-octeon_platform_usb.patch
@@ -1,8 +1,6 @@
-Index: linux-3.10.49/arch/mips/cavium-octeon/octeon-platform.c
-===================================================================
---- linux-3.10.49.orig/arch/mips/cavium-octeon/octeon-platform.c       2014-07-26 20:39:48.109010152 +0100
-+++ linux-3.10.49/arch/mips/cavium-octeon/octeon-platform.c    2014-07-26 20:41:10.005008627 +0100
-@@ -82,7 +82,7 @@
+--- a/arch/mips/cavium-octeon/octeon-platform.c
++++ b/arch/mips/cavium-octeon/octeon-platform.c
+@@ -82,7 +82,7 @@ static int __init octeon_ehci_device_ini
        };
  
        /* Only Octeon2 has ehci/ohci */
@@ -11,7 +9,7 @@ Index: linux-3.10.49/arch/mips/cavium-octeon/octeon-platform.c
                return 0;
  
        if (octeon_is_simulation() || usb_disabled())
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ static int __init octeon_ohci_device_ini
        };
  
        /* Only Octeon2 has ehci/ohci */