Merge branch 'fixes' into tty-next

[linux-2.6-block.git] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 6bb7e90c8f22bc7a6d8e717a414dbd4130dfb97e..8fa1134e005165dc2ca33ef43b9d575368602590 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1857,7 +1857,6 @@ static void pch_uart_exit_port(struct eg20t_port *priv)
                debugfs_remove(priv->debugfs);
 #endif
        uart_remove_one_port(&pch_uart_driver, &priv->port);
-       pci_set_drvdata(priv->pdev, NULL);
        free_page((unsigned long)priv->rxbuf.buf);
 }
 
@@ -1911,7 +1910,7 @@ static int pch_uart_pci_resume(struct pci_dev *pdev)
 #define pch_uart_pci_resume NULL
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = {
+static const struct pci_device_id pch_uart_pci_id[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811),
         .driver_data = pch_et20t_uart0},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812),