aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2012-08-17 16:23:56 +0800
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-08-23 15:00:10 +0200
commit9e0255dd035348953e23161b7158b2ce0ddc182e (patch)
tree1c37f32814f414fd592df927a16c495d7bb0766e /arch/arm
parent2ed1f58900280f79485bbc15f781687bd9584675 (diff)
downloadlinux-linaro-stable-9e0255dd035348953e23161b7158b2ce0ddc182e.tar.gz
ARM: at91/dts: remove partial parameter in at91sam9g25ek.dts
Remove the malformed "mem=" bootargs parameter in at91sam9g25ek.dts Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91sam9g25ek.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index 7829a4d0cb22..96514c134e54 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -15,7 +15,7 @@
compatible = "atmel,at91sam9g25ek", "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 {