git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02730d3) | patch
serial/amba-pl011: Fix mismerge between v4.1-rc4 and tty-next
authorDave Martin <Dave.Martin@arm.com>
Tue, 19 May 2015 10:51:14 +0000 (11:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 May 2015 23:42:10 +0000 (16:42 -0700)
commitfa8cd0f61fe17a8b202a23b68b2d0393c872372b
tree6f102eba355e8601281a7c448664d1d4e0ef6919tree | snapshot
parent02730d3c053a9af1d402e1c8dc8bbbc5a1340406commit | diff
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>
drivers/tty/serial/amba-pl011.c diff | blob | history
Pandora Kernel Repository