From d63423adc9f46ef260f5b0c27d0cde2f39258988 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 8 Oct 2010 10:23:44 -0700
Subject: [PATCH] --- yaml --- r: 216996 b: refs/heads/master c:
 6f911492ed901dcafc9c5c7f507087bb94218ba7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 621ba32142a6..c4318beb4478 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 503923eeecb93ff69ee940549f314e0fe3a68429
+refs/heads/master: 6f911492ed901dcafc9c5c7f507087bb94218ba7
diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
index 7deec89872c7..ccedde1371c3 100644
--- a/trunk/arch/arm/configs/omap2plus_defconfig
+++ b/trunk/arch/arm/configs/omap2plus_defconfig
@@ -63,7 +63,7 @@ CONFIG_AEABI=y
 CONFIG_LEDS=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyS2,115200"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 CONFIG_KEXEC=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y