From e1cda447a8257cd4ad0d1624a74ba9ec83e13aa6 Mon Sep 17 00:00:00 2001
From: Bo Shen <voice.shen@atmel.com>
Date: Fri, 17 Aug 2012 16:23:56 +0800
Subject: [PATCH] --- yaml --- r: 322524 b: refs/heads/master c:
 9e0255dd035348953e23161b7158b2ce0ddc182e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/boot/dts/at91sam9g25ek.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 850fd1f5e23e..8df91317f251 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ed1f58900280f79485bbc15f781687bd9584675
+refs/heads/master: 9e0255dd035348953e23161b7158b2ce0ddc182e
diff --git a/trunk/arch/arm/boot/dts/at91sam9g25ek.dts b/trunk/arch/arm/boot/dts/at91sam9g25ek.dts
index 7829a4d0cb22..96514c134e54 100644
--- a/trunk/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/trunk/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 {