projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d45aebb
)
[PATCH] parport: remove duplicate entry for NETMOS_9835
author
Martin Michlmayr
<tbm@cyrius.com>
Tue, 11 Apr 2006 05:54:27 +0000
(22:54 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 11 Apr 2006 13:18:45 +0000
(06:18 -0700)
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>
drivers/parport/parport_serial.c
patch
|
blob
|
history
diff --git
a/drivers/parport/parport_serial.c
b/drivers/parport/parport_serial.c
index d121644646b9e53a377ebd6916a8dec04a7405da..98b83a85c60e2d462fe92e4e39de2e6f0e977945 100644
(file)
--- 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,