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
/
at91sam9261ek.dts
diff --git
a/arch/arm/boot/dts/at91sam9261ek.dts
b/arch/arm/boot/dts/at91sam9261ek.dts
index c4ef74fea97c222b3b60412a3fbbeb240d1d4a05..beed819609e8d365add7df4cbf1af61f39354ed2 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9261ek.dts
+++ b/
arch/arm/boot/dts/at91sam9261ek.dts
@@
-16,7
+16,7
@@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory
@20000000
{
reg = <0x20000000 0x4000000>;
};