kernel: update 3.14 to 3.14.18
[openwrt.git] / target / linux / ramips / patches-3.14 / 0007-MIPS-ralink-add-support-for-MT7620n.patch
index 3606acb..1d50710 100644 (file)
@@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  arch/mips/ralink/mt7620.c                  |   19 ++++++++++++-------
  2 files changed, 14 insertions(+), 12 deletions(-)
 
-diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
-index 7ff9290..27b2fa9 100644
 --- a/arch/mips/include/asm/mach-ralink/mt7620.h
 +++ b/arch/mips/include/asm/mach-ralink/mt7620.h
 @@ -25,11 +25,8 @@
@@ -29,11 +27,9 @@ index 7ff9290..27b2fa9 100644
  
  #define SYSCFG0_XTAL_FREQ_SEL         BIT(6)
  
-diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
-index 5846817..4fdee17 100644
 --- a/arch/mips/ralink/mt7620.c
 +++ b/arch/mips/ralink/mt7620.c
-@@ -357,22 +357,27 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
+@@ -357,22 +357,27 @@ void prom_soc_init(struct ralink_soc_inf
        u32 cfg0;
        u32 pmu0;
        u32 pmu1;
@@ -68,6 +64,3 @@ index 5846817..4fdee17 100644
        snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
                "Ralink %s ver:%u eco:%u",
                name,
--- 
-1.7.10.4
-