The following commit has been merged in the linux branch: commit 54341c9b741dc5646842fe47eccfc3b506c6dafa Author: Santosh Shilimkar santosh.shilimkar@ti.com Date: Thu Oct 22 14:48:14 2009 -0700

omap4: Fix UART4 platform data on omap4

This patch removes the unnecessary UART4 platform which is under data is wrong because of this

There is a separate platform structure for UART4

Signed-off-by: Santosh Shilimkar santosh.shilimkar@ti.com Reviewed-By: Kevin Hilman khilman@deeprootsystems.com Signed-off-by: Tony Lindgren tony@atomide.com

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index ae21868..54dfeb5 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -109,16 +109,6 @@ static struct plat_serial8250_port serial_platform_data2[] = { .regshift = 2, .uartclk = OMAP24XX_BASE_BAUD * 16, }, { -#ifdef CONFIG_ARCH_OMAP4 - .membase = OMAP2_IO_ADDRESS(OMAP_UART4_BASE), - .mapbase = OMAP_UART4_BASE, - .irq = 70, - .flags = UPF_BOOT_AUTOCONF, - .iotype = UPIO_MEM, - .regshift = 2, - .uartclk = OMAP24XX_BASE_BAUD * 16, - }, { -#endif .flags = 0 } };