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

Browse source

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

...

This commit is contained in:

Dave Martin 2015-05-19 11:51:14 +01:00 • committed by Greg Kroah-Hartman

parent 02730d3c05

commit fa8cd0f61f

1 changed files with 0 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/tty/serial/amba-pl011.c

View file