projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: move MAGIC to dts
[15.05/openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.14
/
555-board_96318ref.patch
diff --git
a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
index
8ac3259
..
674770c
100644
(file)
--- a/
target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
+++ b/
target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
@@
-1,7
+1,7
@@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -
90,6 +90
,93 @@ static struct board_info __initdata boar
- #endif
+@@ -
62,6 +62
,93 @@ static struct board_info __initdata boar
+ #endif
/* CONFIG_BCM63XX_CPU_3368 */
/*
+ * known 6318 boards
/*
+ * known 6318 boards
@@
-88,13
+88,13
@@
+ },
+ },
+};
+ },
+ },
+};
-+#endif
++#endif
/* CONFIG_BCM63XX_CPU_6318 */
+
+/*
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
+
+/*
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -
4330,6 +4417
,9 @@ static const struct board_info __initcon
+@@ -
1679,6 +1766
,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif