diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/arm/mach-omap2/serial.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index ae2186892c85..54dfeb5d5667 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[] = { | |||
| 109 | .regshift = 2, | 109 | .regshift = 2, |
| 110 | .uartclk = OMAP24XX_BASE_BAUD * 16, | 110 | .uartclk = OMAP24XX_BASE_BAUD * 16, |
| 111 | }, { | 111 | }, { |
| 112 | #ifdef CONFIG_ARCH_OMAP4 | ||
| 113 | .membase = OMAP2_IO_ADDRESS(OMAP_UART4_BASE), | ||
| 114 | .mapbase = OMAP_UART4_BASE, | ||
| 115 | .irq = 70, | ||
| 116 | .flags = UPF_BOOT_AUTOCONF, | ||
| 117 | .iotype = UPIO_MEM, | ||
| 118 | .regshift = 2, | ||
| 119 | .uartclk = OMAP24XX_BASE_BAUD * 16, | ||
| 120 | }, { | ||
| 121 | #endif | ||
| 122 | .flags = 0 | 112 | .flags = 0 |
| 123 | } | 113 | } |
| 124 | }; | 114 | }; |