linux-next: build failure after merge of the tty tree

From: Stephen Rothwell
Date: Mon May 11 2015 - 01:16:37 EST

Hi Greg,

After merging the tty tree, today's linux-next build (arm multi_v7_defconfig)
failed like this:

drivers/tty/serial/amba-pl011.c: In function 'pl011_startup':
drivers/tty/serial/amba-pl011.c:1582:5: error: 'struct uart_amba_port' has no member named 'tx_irq_seen'
uap->tx_irq_seen = 0;

Caused by a mismerge between patch "Revert "serial/amba-pl011: Leave
the TX IRQ alone when the UART is not open" (that appears in Linus' tree
and the tty tree) and commit 1e84d22322ce ("serial/amba-pl011: Refactor
and simplify TX FIFO handling") from the tty tree.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 11 May 2015 15:12:50 +1000
Subject: [PATCH] serial/amba-pl011: fix mismerge

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
drivers/tty/serial/amba-pl011.c | 3 ---
1 file changed, 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;

/* restore RTS and DTR */

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgphx8i_UUnng.pgp
Description: OpenPGP digital signature