The following commit has been merged in the linux branch: commit 60dbd8c95fe21955391bbaf0b66ac443742a3dd4 Author: Tony Lindgren tony@atomide.com Date: Thu Oct 22 14:48:13 2009 -0700

omap2: Fix console serial port number for n8x0

With the recent changes omap serial ports match the physical numbering like they should. Fix the kernel CMDLINE accordingly so console works.

Signed-off-by: Tony Lindgren tony@atomide.com

diff --git a/arch/arm/configs/n8x0_defconfig b/arch/arm/configs/n8x0_defconfig index 8da75de..264f52b 100644 --- a/arch/arm/configs/n8x0_defconfig +++ b/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