From 83796d5b3cac9a2623f07861014196170f5b6f47 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 22 Oct 2009 14:48:13 -0700
Subject: [PATCH] --- yaml --- r: 167842 b: refs/heads/master c:
 60dbd8c95fe21955391bbaf0b66ac443742a3dd4 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/configs/n8x0_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 036f8edc2612..de9bcf642225 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2fbf3451d338ac68c8a555207183647074f78a0
+refs/heads/master: 60dbd8c95fe21955391bbaf0b66ac443742a3dd4
diff --git a/trunk/arch/arm/configs/n8x0_defconfig b/trunk/arch/arm/configs/n8x0_defconfig
index 8da75dede52e..264f52b5c52d 100644
--- a/trunk/arch/arm/configs/n8x0_defconfig
+++ b/trunk/arch/arm/configs/n8x0_defconfig
@@ -304,7 +304,7 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ZBOOT_ROM_TEXT=0x10C08000
 CONFIG_ZBOOT_ROM_BSS=0x10200000
 # CONFIG_ZBOOT_ROM is not set
-CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 console=ttyS0,115200n8"
+CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 console=ttyS2,115200n8"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set