brcm63xx: update bmips patches with upstream submission

[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch

diff --git a/target/linux/brcm63xx/patches-3.10/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch b/target/linux/brcm63xx/patches-3.10/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch
index 6f4763420b7bd993fb9f2acfd8d87b2f40c5149b..3eae0fcd1d0cc5caae032688eb24c4f6c7e6cd2e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch
+++ b/target/linux/brcm63xx/patches-3.10/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/include/asm/bmips.h
 +++ b/arch/mips/include/asm/bmips.h
-@@ -70,15 +70,15 @@ static inline unsigned long bmips_read_z
+@@ -97,15 +97,15 @@ static inline unsigned long bmips_read_z
                ".set noreorder\n"
                "cache %1, 0(%2)\n"
                "sync\n"
@@ -45,7 +45,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                ".set pop\n"
                : "=&r" (ret)
                : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-@@ -92,13 +92,13 @@ static inline void bmips_write_zscm_reg(
+@@ -119,13 +119,13 @@ static inline void bmips_write_zscm_reg(
                ".set push\n"
                ".set noreorder\n"
                "mtc0 %0, $28, 3\n"