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
/
556-board_96318ref_p300.patch
diff --git
a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
index
7f407da
..
024497f
100644
(file)
--- a/
target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
+++ b/
target/linux/brcm63xx/patches-3.14/556-board_96318ref_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
74,6 +174
,94 @@ static struct board_info __initdata boar
+@@ -1
46,6 +146
,94 @@ static struct board_info __initdata boar
},
},
};
},
},
};
@@
-92,10
+92,10
@@
+ },
+ },
+};
+ },
+ },
+};
- #endif
+ #endif
/* CONFIG_BCM63XX_CPU_6318 */
/*
/*
-@@ -
4343,6 +4431
,7 @@ static const struct board_info __initcon
+@@ -
1768,6 +1856
,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,