diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/ide/setup-pci.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/ide/setup-pci.c')
| -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) |