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 'for-linus' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
marvell
/
armada-8080-db.dts
diff --git
a/arch/arm64/boot/dts/marvell/armada-8080-db.dts
b/arch/arm64/boot/dts/marvell/armada-8080-db.dts
index 707af833832be2039fa82af404e7ac3357b6b38d..85b58a19a9fb836175e41a465ee1fe5e8fd7d9bc 100644
(file)
--- a/
arch/arm64/boot/dts/marvell/armada-8080-db.dts
+++ b/
arch/arm64/boot/dts/marvell/armada-8080-db.dts
@@
-55,7
+55,7
@@
stdout-path = "serial0:115200n8";
};
- memory@0
0000000
{
+ memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>;
};