diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-03-22 07:32:09 -0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-03-26 07:27:35 -0400 |
| commit | b090e5f68c0353534880b95ea0df56b8c0230b8c (patch) | |
| tree | 6c0a67c4169d5bb544ab6771a729abab451600cd | |
| parent | 88fcb59a06556bf10eac97d7abb913cccea2c830 (diff) | |
ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
Remove the malformed "mem=" bootargs parameter in at91sam9x5ek.dtsi
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> # 3.8+
| -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 1128565e62bd..9e292db0181b 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; | 13 | compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; |
| 14 | 14 | ||
| 15 | chosen { | 15 | chosen { |
| 16 | bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; | 16 | bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | ahb { | 19 | ahb { |