On Tue, Oct 25, 2011 at 07:12:17PM +1100, Stephen Rothwell wrote:

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250_pci.c between commit dacacc3e794c
("serial/8250_pci: delete duplicate data definition") from Linus' tree
and commit 64d91cfaade2 ("8250_pci: Fix kernel panic when pch_uart is
disabled") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix is correct.

greg k-h