projects
/
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
[openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.18
/
560-board_963268gu_p300.patch
diff --git
a/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
b/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
index
289e5de
..
c25d8ca
100644
(file)
--- a/
target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
+++ b/
target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
@@
-1,6
+1,6
@@
--- 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
-@@ -1
905,6 +1905
,66 @@ static struct board_info __initdata boar
+@@ -1
867,6 +1867
,66 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@@
-67,7
+67,7
@@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -21
55,6 +2215
,7 @@ static const struct board_info __initcon
+@@ -21
17,6 +2177
,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
@@
-75,7
+75,7
@@
&board_963269bhr,
&board_vw6339gu,
#endif
&board_963269bhr,
&board_vw6339gu,
#endif
-@@ -22
38,6 +2299
,7 @@ static struct of_device_id const bcm963x
+@@ -22
01,6 +2262
,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268