diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 20:35:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 20:35:58 +0200 |
| commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
| tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /drivers/ide | |
| parent | [PATCH] ARM: Fix new-ABI layout of struct stat64 (diff) | |
| parent | [PATCH] gregkh-pci-pci-assign-unassigned-resources fix (diff) | |
| download | linux-346fced899c7390e555cf90cd07d1e56b460d21b.tar.xz linux-346fced899c7390e555cf90cd07d1e56b460d21b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/setup-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index e501675ad72e..77da827b2898 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -847,7 +847,7 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) d = list_entry(l, struct pci_driver, node); if(d->id_table) { - const struct pci_device_id *id = pci_match_device(d->id_table, dev); + const struct pci_device_id *id = pci_match_id(d->id_table, dev); if(id != NULL) { if(d->probe(dev, id) >= 0) |