kernel: update 3.10 to 3.10.9

[openwrt/staging/stintel.git] / target / linux / octeon / patches-3.10 / 0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch

diff --git a/target/linux/octeon/patches-3.10/0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch b/target/linux/octeon/patches-3.10/0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch
index 6f1270020e556fea03323ac3310823d325c8f600..0a905d5c38d7ffd69bacf96411911481b30880f2 100644 (file)
--- a/target/linux/octeon/patches-3.10/0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch
+++ b/target/linux/octeon/patches-3.10/0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch
@@ -24,11 +24,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/cavium-octeon/octeon-platform.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
-index 7b746e7..1830874 100644
 --- a/arch/mips/cavium-octeon/octeon-platform.c
 +++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac)
+@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(
        char name_buffer[20];
        int iface;
        int p;
@@ -41,6 +39,3 @@ index 7b746e7..1830874 100644
  
        snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
        iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
--- 
-1.7.10.4
-