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 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
r8a7779-marzen.dts
diff --git
a/arch/arm/boot/dts/r8a7779-marzen.dts
b/arch/arm/boot/dts/r8a7779-marzen.dts
index
a7af2c2
..
ee23388
100644
(file)
--- a/
arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/
arch/arm/boot/dts/r8a7779-marzen.dts
@@
-17,7
+17,7
@@
compatible = "renesas,marzen", "renesas,r8a7779";
chosen {
- bootargs = "console=ttySC2,115200
earlyprintk=sh-sci.2,115200
ignore_loglevel root=/dev/nfs ip=on";
+ bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
};
memory {