git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
marvell
/
armada-7040.dtsi
diff --git
a/arch/arm64/boot/dts/marvell/armada-7040.dtsi
b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
index 78d995d62707190dc19bc1f1e8cf20e6f7d64e45..cbe460b8fc0004d5ffd278a4a5d1af36f5b594a0 100644
(file)
--- a/
arch/arm64/boot/dts/marvell/armada-7040.dtsi
+++ b/
arch/arm64/boot/dts/marvell/armada-7040.dtsi
@@
-46,7
+46,7
@@
*/
#include "armada-ap806-quad.dtsi"
-#include "armada-
cp110-master
.dtsi"
+#include "armada-
70x0
.dtsi"
/ {
model = "Marvell Armada 7040";