aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-23 18:06:11 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-23 18:06:11 +0000
commit2d379e796f27e7ab4bbc3d5406776722ecba379b (patch)
tree65aa809ad1c4083c2b4a663c29034ebffe1449d0 /target/linux/brcm47xx
parent2190f090bb8bd1a575cc3534cb799e14841cb3f1 (diff)
downloadupstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.gz
upstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.bz2
upstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.zip
kernel: update 4.1 to 4.1.6
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46713
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
index db847bde78..11d90ec6e8 100644
--- a/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
@@ -242,7 +242,7 @@
#endif /* _ASM_R4KCACHE_H */
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
-@@ -333,6 +333,10 @@
+@@ -358,6 +358,10 @@
.macro RESTORE_SP_AND_RET
LONG_L sp, PT_R29(sp)
.set arch=r4000