From: Martin Michlmayr Date: Tue, 11 Apr 2006 05:54:27 +0000 (-0700) Subject: [PATCH] parport: remove duplicate entry for NETMOS_9835 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ad04b0d0ebed1844522dd83cca0ef838d1ac673;p=mv-sheeva.git [PATCH] parport: remove duplicate entry for NETMOS_9835 Remove a duplicated entry from parport_serial_pci_tbl. Signed-off-by: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index d121644646b..98b83a85c60 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c @@ -100,8 +100,6 @@ static struct pci_device_id parport_serial_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9845, PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,