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 branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
stih407-b2120.dts
diff --git
a/arch/arm/boot/dts/stih407-b2120.dts
b/arch/arm/boot/dts/stih407-b2120.dts
index a7a0f76e9cbc7e64cf8dcc356da6625e9ea08472..62ce1cecbb1f66138e193efbed2478cbb915a79c 100644
(file)
--- a/
arch/arm/boot/dts/stih407-b2120.dts
+++ b/
arch/arm/boot/dts/stih407-b2120.dts
@@
-15,10
+15,10
@@
chosen {
bootargs = "clk_ignore_unused";
-
linux,
stdout-path = &sbc_serial0;
+ stdout-path = &sbc_serial0;
};
- memory {
+ memory
@40000000
{
device_type = "memory";
reg = <0x40000000 0x80000000>;
};