diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/arm/mach-omap1/serial.c | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index aefc967fc003..528691d5cb51 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -67,8 +67,8 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p) | |||
| 67 | 67 | ||
| 68 | static struct plat_serial8250_port serial_platform_data[] = { | 68 | static struct plat_serial8250_port serial_platform_data[] = { |
| 69 | { | 69 | { |
| 70 | .membase = (char*)IO_ADDRESS(OMAP_UART1_BASE), | 70 | .membase = IO_ADDRESS(OMAP_UART1_BASE), |
| 71 | .mapbase = (unsigned long)OMAP_UART1_BASE, | 71 | .mapbase = OMAP_UART1_BASE, |
| 72 | .irq = INT_UART1, | 72 | .irq = INT_UART1, |
| 73 | .flags = UPF_BOOT_AUTOCONF, | 73 | .flags = UPF_BOOT_AUTOCONF, |
| 74 | .iotype = UPIO_MEM, | 74 | .iotype = UPIO_MEM, |
| @@ -76,8 +76,8 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 76 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 76 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
| 77 | }, | 77 | }, |
| 78 | { | 78 | { |
| 79 | .membase = (char*)IO_ADDRESS(OMAP_UART2_BASE), | 79 | .membase = IO_ADDRESS(OMAP_UART2_BASE), |
| 80 | .mapbase = (unsigned long)OMAP_UART2_BASE, | 80 | .mapbase = OMAP_UART2_BASE, |
| 81 | .irq = INT_UART2, | 81 | .irq = INT_UART2, |
| 82 | .flags = UPF_BOOT_AUTOCONF, | 82 | .flags = UPF_BOOT_AUTOCONF, |
| 83 | .iotype = UPIO_MEM, | 83 | .iotype = UPIO_MEM, |
| @@ -85,8 +85,8 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 85 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 85 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
| 86 | }, | 86 | }, |
| 87 | { | 87 | { |
| 88 | .membase = (char*)IO_ADDRESS(OMAP_UART3_BASE), | 88 | .membase = IO_ADDRESS(OMAP_UART3_BASE), |
| 89 | .mapbase = (unsigned long)OMAP_UART3_BASE, | 89 | .mapbase = OMAP_UART3_BASE, |
| 90 | .irq = INT_UART3, | 90 | .irq = INT_UART3, |
| 91 | .flags = UPF_BOOT_AUTOCONF, | 91 | .flags = UPF_BOOT_AUTOCONF, |
| 92 | .iotype = UPIO_MEM, | 92 | .iotype = UPIO_MEM, |