diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
| commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
| tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /drivers/ide | |
| parent | 17af691cd19765b782d891fc50c1568d0f1276b3 (diff) | |
| parent | 43a6b76050aa137c51d00eec91d67ac43ac3846e (diff) | |
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) | |||
| 847 | d = list_entry(l, struct pci_driver, node); | 847 | d = list_entry(l, struct pci_driver, node); |
| 848 | if(d->id_table) | 848 | if(d->id_table) |
| 849 | { | 849 | { |
| 850 | const struct pci_device_id *id = pci_match_device(d->id_table, dev); | 850 | const struct pci_device_id *id = pci_match_id(d->id_table, dev); |
| 851 | if(id != NULL) | 851 | if(id != NULL) |
| 852 | { | 852 | { |
| 853 | if(d->probe(dev, id) >= 0) | 853 | if(d->probe(dev, id) >= 0) |