diff options
| author | Dave Martin <Dave.Martin@arm.com> | 2015-05-19 13:51:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-20 02:42:10 +0300 |
| commit | fa8cd0f61fe17a8b202a23b68b2d0393c872372b (patch) | |
| tree | 6f102eba355e8601281a7c448664d1d4e0ef6919 /drivers | |
| parent | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (diff) | |
| download | linux-fa8cd0f61fe17a8b202a23b68b2d0393c872372b.tar.xz | |
serial/amba-pl011: Fix mismerge between v4.1-rc4 and tty-next
In commit 02730d3c053a9af1d402e1c8dc8bbbc5a1340406
(Merge 4.1-rc4 into tty-next), git mismerged some lines,
reintroducing a reference to the removed field
uart_amba_port.tx_irq_seen. This causes a build failure.
This patch removes the mismerged lines, restoring the code to what
was in tty-next (which was the intention).
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 6fabc059efed..f5bd8426fd75 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1578,9 +1578,6 @@ static int pl011_startup(struct uart_port *port) writew(uap->vendor->ifls, uap->port.membase + UART011_IFLS); - /* Assume that TX IRQ doesn't work until we see one: */ - uap->tx_irq_seen = 0; - spin_lock_irq(&uap->port.lock); /* restore RTS and DTR */ |