summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-04-11 07:54:27 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 15:18:45 +0200
commit7ad04b0d0ebed1844522dd83cca0ef838d1ac673 (patch)
treee9063726ccc7d20f1b19440c2266179fc70dc8c3 /drivers/parport
parent[PATCH] kexec: update MAINTAINERS (diff)
downloadlinux-7ad04b0d0ebed1844522dd83cca0ef838d1ac673.tar.xz
linux-7ad04b0d0ebed1844522dd83cca0ef838d1ac673.zip
[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[] = {
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,