aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-04-11 01:54:27 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 09:18:45 -0400
commit7ad04b0d0ebed1844522dd83cca0ef838d1ac673 (patch)
treee9063726ccc7d20f1b19440c2266179fc70dc8c3 /drivers/parport
parentd45aebbfa4d0682ec9b15c3687835ac1f5f01f50 (diff)
[PATCH] parport: remove duplicate entry for NETMOS_9835
Remove a duplicated entry from parport_serial_pci_tbl. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_serial.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index d121644646b9..98b83a85c60e 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[] = {
100 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, 100 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
101 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, 101 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
102 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, 102 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
103 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
104 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
105 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9845, 103 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9845,
106 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, 104 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
107 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, 105 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,