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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/tty/serial/8250_pci.c
index 3abeca2,1b449b7..0000000
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@@ -1598,7 -1639,14 +1639,8 @@@ static struct pci_serial_quirk pci_seri
.vendor = 0x10DB,
.device = 0x800D,
.init = pci_eg20t_init,
+ .setup = pci_default_setup,
},
- {
- .vendor = 0x10DB,
- .device = 0x800D,
- .init = pci_eg20t_init,
- .setup = pci_default_setup,
- },
/*
* Cronyx Omega PCI (PLX-chip based)
*/
Attachment:
pgpDyAxEKZvIa.pgp
Description: PGP signature
