Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5328ae3a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Fix compile for arch/arm/mach-omap2 



Patch 94113260 split IO_ADDRESS
into OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS except for the omap4
code to avoid merge conflicts with the omap4 code that was queued
earlier.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 94e0fb08

arch/arm/mach-omap2/serial.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static struct plat_serial8250_port serial_platform_data2[] = { 
		.uartclk	= OMAP24XX_BASE_BAUD * 16,

	}, {

#ifdef CONFIG_ARCH_OMAP4

		.membase	= IO_ADDRESS(OMAP_UART4_BASE),

		.membase	= OMAP2_IO_ADDRESS(OMAP_UART4_BASE),

		.mapbase	= OMAP_UART4_BASE,

		.irq		= 70,

		.flags		= UPF_BOOT_AUTOCONF,
@@ -126,7 +126,7 @@ static struct plat_serial8250_port serial_platform_data2[] = { 
#ifdef CONFIG_ARCH_OMAP4

static struct plat_serial8250_port serial_platform_data3[] = {

	{

		.membase	= IO_ADDRESS(OMAP_UART4_BASE),

		.membase	= OMAP2_IO_ADDRESS(OMAP_UART4_BASE),

		.mapbase	= OMAP_UART4_BASE,

		.irq		= 70,

		.flags		= UPF_BOOT_AUTOCONF,