aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-08-09 11:09:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-08-09 11:09:52 +0000
commit0b8643af4fa7eebd55b63d6d547f85da1409f83d (patch)
tree4089a6861f684c95f6702412fc45b7d46a8fb46e /target/linux/brcm63xx
parent3e52c8c35706f9cb7fa9dfb8cd4cbbaebb4d5fc7 (diff)
downloadupstream-0b8643af4fa7eebd55b63d6d547f85da1409f83d.tar.gz
upstream-0b8643af4fa7eebd55b63d6d547f85da1409f83d.tar.bz2
upstream-0b8643af4fa7eebd55b63d6d547f85da1409f83d.zip
kernel: update 3.18 to 3.18.20
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46570
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch
index 7b8b727803..f4e0fbf4c1 100644
--- a/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch
+++ b/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -225,6 +225,46 @@ static struct board_info __initdata board_dsl_2751b_d1 = {
+@@ -225,6 +225,46 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
},
};
@@ -47,7 +47,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2352,6 +2392,7 @@ static const struct board_info __initconst *bcm963xx_boards[] = {
+@@ -2352,6 +2392,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
@@ -55,7 +55,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2449,6 +2490,7 @@ static struct of_device_id const bcm963xx_boards_dt[] = {
+@@ -2449,6 +2490,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
{ .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, },