diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-09-24 19:23:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-09-24 19:23:04 -0400 |
| commit | 5328ae3af18b16df758df1bcb28fb5e1ad56d97a (patch) | |
| tree | f660e89b7c1c08e16701d0714c182ace738b37df /arch | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
omap: Fix compile for arch/arm/mach-omap2
Patch 941132606c7611246d2034cb7b01f9270c2d1ede 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: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 3a529c77daa8..faada9fbfbcf 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -110,7 +110,7 @@ static struct plat_serial8250_port serial_platform_data2[] = { | |||
| 110 | .uartclk = OMAP24XX_BASE_BAUD * 16, | 110 | .uartclk = OMAP24XX_BASE_BAUD * 16, |
| 111 | }, { | 111 | }, { |
| 112 | #ifdef CONFIG_ARCH_OMAP4 | 112 | #ifdef CONFIG_ARCH_OMAP4 |
| 113 | .membase = IO_ADDRESS(OMAP_UART4_BASE), | 113 | .membase = OMAP2_IO_ADDRESS(OMAP_UART4_BASE), |
| 114 | .mapbase = OMAP_UART4_BASE, | 114 | .mapbase = OMAP_UART4_BASE, |
| 115 | .irq = 70, | 115 | .irq = 70, |
| 116 | .flags = UPF_BOOT_AUTOCONF, | 116 | .flags = UPF_BOOT_AUTOCONF, |
| @@ -126,7 +126,7 @@ static struct plat_serial8250_port serial_platform_data2[] = { | |||
| 126 | #ifdef CONFIG_ARCH_OMAP4 | 126 | #ifdef CONFIG_ARCH_OMAP4 |
| 127 | static struct plat_serial8250_port serial_platform_data3[] = { | 127 | static struct plat_serial8250_port serial_platform_data3[] = { |
| 128 | { | 128 | { |
| 129 | .membase = IO_ADDRESS(OMAP_UART4_BASE), | 129 | .membase = OMAP2_IO_ADDRESS(OMAP_UART4_BASE), |
| 130 | .mapbase = OMAP_UART4_BASE, | 130 | .mapbase = OMAP_UART4_BASE, |
| 131 | .irq = 70, | 131 | .irq = 70, |
| 132 | .flags = UPF_BOOT_AUTOCONF, | 132 | .flags = UPF_BOOT_AUTOCONF, |