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 tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dra72-evm.dts
diff --git
a/arch/arm/boot/dts/dra72-evm.dts
b/arch/arm/boot/dts/dra72-evm.dts
index cc1d32ca4a8ae1cb453cb776496fb866905597ed..e3a9b6985693fcbe3fbc23993e93f2ebbe56629e 100644
(file)
--- a/
arch/arm/boot/dts/dra72-evm.dts
+++ b/
arch/arm/boot/dts/dra72-evm.dts
@@
-9,7
+9,7
@@
/ {
model = "TI DRA722";
- memory {
+ memory
@0
{
device_type = "memory";
reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
};