projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge HEAD from ../from-linus
[powerpc.git]
/
drivers
/
parport
/
parport_pc.c
diff --git
a/drivers/parport/parport_pc.c
b/drivers/parport/parport_pc.c
index
80edfa3
..
4598c6a
100644
(file)
--- a/
drivers/parport/parport_pc.c
+++ b/
drivers/parport/parport_pc.c
@@
-3008,7
+3008,7
@@
static int __init parport_pc_init_superio (int autoirq, int autodma)
int ret = 0;
while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
- id = pci_match_
device
(parport_pc_pci_tbl, pdev);
+ id = pci_match_
id
(parport_pc_pci_tbl, pdev);
if (id == NULL || id->driver_data >= last_sio)
continue;