From: Dave Martin Date: Tue, 19 May 2015 10:51:14 +0000 (+0100) Subject: serial/amba-pl011: Fix mismerge between v4.1-rc4 and tty-next X-Git-Tag: omap-for-v4.2/wakeirq-drivers-v2^2~58 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8cd0f61fe17a8b202a23b68b2d0393c872372b;p=pandora-kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed