Commit fa8cd0f6 authored May 19, 2015 by Dave Martin Committed by Greg Kroah-Hartman May 19, 2015

serial/amba-pl011: Fix mismerge between v4.1-rc4 and tty-next



In commit 02730d3c
(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>

parent 02730d3c

drivers/tty/serial/amba-pl011.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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 */