From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042929.019927968@goodmis.org> Date: Wed, 11 Sep 2013 00:30:48 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Ferre Subject: [221/251] ARM: at91/DT: fix at91sam9n12ek memory node References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0221-ARM-at91-DT-fix-at91sam9n12ek-memory-node.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicolas Ferre [ Upstream commit a57603ca2871ee0773b00839c1ea35c4a2d3eeb0 ] Signed-off-by: Nicolas Ferre Cc: stable # 3.5+ Signed-off-by: Steven Rostedt --- arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index f4e43e3..84d8bdb 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -14,11 +14,11 @@ compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9"; chosen { - bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; + bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; }; memory { - reg = <0x20000000 0x10000000>; + reg = <0x20000000 0x8000000>; }; clocks { -- 1.7.10.4