diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
commit | 79dbf9d1a443fc015e05dbeb5ab610059c6d9bf1 (patch) | |
tree | 044b23d8cb4827763dc0728dbaa76c4cd0eb7ac2 /arch/arm/boot/dts/at91sam9x5ek.dtsi | |
parent | de507154419bcaf3c135b94ba3bbb3f3a6464447 (diff) | |
parent | c554f06fc801004f3fc3b162c490d8fdf4e79725 (diff) |
Merge branch 'tracking-linux-3.9.y' into merge-linux-linaro-core-trackingllct-20130508.0
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5ek.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi index 8a7cf1d9cf5d..ccab2568b0d7 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi @@ -13,7 +13,7 @@ compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; chosen { - bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; + bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; }; ahb { |