projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
berlin2q-marvell-dmp.dts
diff --git
a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
index
33b2875
..
f485308
100644
(file)
--- a/
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+++ b/
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
@@
-43,7
+43,7
@@
model = "Marvell BG2-Q DMP";
compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
model = "Marvell BG2-Q DMP";
compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
- memory {
+ memory
@0
{
device_type = "memory";
reg = <0x00000000 0x80000000>;
};
device_type = "memory";
reg = <0x00000000 0x80000000>;
};