kernel: update 3.10 to 3.10.34

[openwrt/openwrt.git] / target / linux / ramips / patches-3.10 / 0217-pinmux-rt2880.patch

diff --git a/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch b/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch
index 05d95484da2ca66557c7d28f41deb7cb946a2db3..3cadce737d53e6a4088d88450bdf4b350bedfc78 100644 (file)
--- a/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch
+++ b/target/linux/ramips/patches-3.10/0217-pinmux-rt2880.patch
@@ -1,7 +1,5 @@
-Index: linux-3.10.32/arch/mips/ralink/rt288x.c
-===================================================================
---- linux-3.10.32.orig/arch/mips/ralink/rt288x.c       2014-02-22 20:41:54.000000000 +0000
-+++ linux-3.10.32/arch/mips/ralink/rt288x.c    2014-03-18 11:18:06.689596876 +0000
+--- a/arch/mips/ralink/rt288x.c
++++ b/arch/mips/ralink/rt288x.c
 @@ -17,46 +17,27 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
@@ -67,7 +65,7 @@ Index: linux-3.10.32/arch/mips/ralink/rt288x.c
  };
  
  static void rt288x_wdt_reset(void)
-@@ -69,11 +50,6 @@
+@@ -69,11 +50,6 @@ static void rt288x_wdt_reset(void)
        rt_sysc_w32(t, SYSC_REG_CLKCFG);
  }
  
@@ -79,7 +77,7 @@ Index: linux-3.10.32/arch/mips/ralink/rt288x.c
  void __init ralink_clk_init(void)
  {
        unsigned long cpu_rate;
-@@ -140,4 +116,6 @@
+@@ -140,4 +116,6 @@ void prom_soc_init(struct ralink_soc_inf
        soc_info->mem_base = RT2880_SDRAM_BASE;
        soc_info->mem_size_min = RT2880_MEM_SIZE_MIN;
        soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;