aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:51:34 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:51:34 +0000
commit93b50ade934436d00e5f68c3feabf030ace8d98d (patch)
tree50c113c26115c6815362f0c4a24d03b75c571a76 /target/linux/brcm63xx
parentba3a749f9b29b40784bb576651142c601d4a7211 (diff)
downloadupstream-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.gz
upstream-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.bz2
upstream-93b50ade934436d00e5f68c3feabf030ace8d98d.zip
kernel/4.1: update to version 4.1.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48223
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-4.1/573-board_R5010UNv2.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.1/573-board_R5010UNv2.patch
index cf5a7198e9..6e3b031628 100644
--- a/target/linux/brcm63xx/patches-4.1/573-board_R5010UNv2.patch
+++ b/target/linux/brcm63xx/patches-4.1/573-board_R5010UNv2.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -641,6 +641,51 @@
+@@ -641,6 +641,51 @@ static struct board_info __initdata boar
},
},
};
@@ -52,7 +52,7 @@
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -2452,6 +2497,7 @@
+@@ -2452,6 +2497,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
@@ -60,7 +60,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -2550,6 +2596,7 @@
+@@ -2550,6 +2596,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },