diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 09:39:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 09:39:23 -0700 |
| commit | 10af77c193681398e5dbe830db181d86047fcd41 (patch) | |
| tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 /arch/arm/mach-omap2 | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | 5f1a38952b7e932a1c169c28917b9a831f641bcc (diff) | |
| download | talos-obmc-linux-10af77c193681398e5dbe830db181d86047fcd41.tar.gz talos-obmc-linux-10af77c193681398e5dbe830db181d86047fcd41.zip | |
Merge 3.4-rc4 into tty-next
This resolves the merge problem with:
drivers/tty/serial/pch_uart.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 9fc2f44188cb..de74e05dd929 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -245,14 +245,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate; omap_up.autosuspend_timeout = info->autosuspend_timeout; - /* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */ - if (!cpu_is_omap2420() && !cpu_is_ti816x()) - omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS; - - /* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */ - if (cpu_is_omap34xx() || cpu_is_omap3630()) - omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE; - pdata = &omap_up; pdata_size = sizeof(struct omap_uart_port_info); |
