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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ethernut5.dts
diff --git
a/arch/arm/boot/dts/ethernut5.dts
b/arch/arm/boot/dts/ethernut5.dts
index 052a52f947ce665cd1f18ced6f4ba1096d2eb032..ad7a0850252a1fddcf25eae341705454c16687ae 100644
(file)
--- a/
arch/arm/boot/dts/ethernut5.dts
+++ b/
arch/arm/boot/dts/ethernut5.dts
@@
-15,7
+15,7
@@
bootargs = "console=ttyS0,115200 root=/dev/mtdblock0 rw rootfstype=jffs2";
};
- memory {
+ memory
@20000000
{
reg = <0x20000000 0x08000000>;
};