diff options
| author | Greg Kroah-Hartman | 2012-04-23 18:39:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-04-23 18:39:23 +0200 |
| commit | 10af77c193681398e5dbe830db181d86047fcd41 (patch) | |
| tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 /arch/arm/plat-omap | |
| parent | Linux 3.4-rc4 (diff) | |
| parent | serial/8250_pci: fix suspend/resume vs init/exit quirks (diff) | |
| download | kernel-qcow2-linux-10af77c193681398e5dbe830db181d86047fcd41.tar.gz kernel-qcow2-linux-10af77c193681398e5dbe830db181d86047fcd41.tar.xz kernel-qcow2-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/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-serial.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 9ff444469f3d..1a52725ffcf2 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -65,7 +65,6 @@ struct omap_uart_port_info { bool dma_enabled; /* To specify DMA Mode */ unsigned int uartclk; /* UART clock rate */ upf_t flags; /* UPF_* flags */ - u32 errata; unsigned int dma_rx_buf_size; unsigned int dma_rx_timeout; unsigned int autosuspend_timeout; |