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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
berlin2-sony-nsz-gs7.dts
diff --git
a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
index
3c0907b
..
1c47579
100644
(file)
--- a/
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
+++ b/
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
@@
-49,7
+49,7
@@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory
@0
{
device_type = "memory";
reg = <0x00000000 0x40000000>; /* 1 GB */
};