diff options
| author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2004-07-06 18:49:28 +0000 |
|---|---|---|
| committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2004-07-06 18:49:28 +0000 |
| commit | 61e74858f89e89012d97acb590cfe8e5859fb58b (patch) | |
| tree | b074ec8c1edc5c81f3dd65638213847f15f17f9a /xen/drivers/pci | |
| parent | 0ecd255442c343cc5c679949497e7e77f77b79df (diff) | |
| download | xen-61e74858f89e89012d97acb590cfe8e5859fb58b.tar.gz xen-61e74858f89e89012d97acb590cfe8e5859fb58b.tar.bz2 xen-61e74858f89e89012d97acb590cfe8e5859fb58b.zip | |
bitkeeper revision 1.1041.1.14 (40eaf438sciOdZWe5QAqcjLLtbzF2Q)
Minor PCI tweaks to move ever so slightly toward 2.6 and make ia64
(based on 2.6) easier.
Diffstat (limited to 'xen/drivers/pci')
| -rw-r--r-- | xen/drivers/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index 258d9d8c8a..f8697d1337 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -890,7 +890,7 @@ pci_set_mwi(struct pci_dev *dev) u16 cmd; #ifdef HAVE_ARCH_PCI_MWI - rc = pcibios_set_mwi(dev); + rc = pcibios_prep_mwi(dev); #else rc = pci_generic_prep_mwi(dev); #endif @@ -1384,7 +1384,7 @@ struct pci_dev * __devinit pci_scan_slot(struct pci_dev *temp) temp->hdr_type = hdr_type & 0x7f; dev = pci_scan_device(temp); - if (!pcibios_scan_all_fns() && func == 0) { + if (!pcibios_scan_all_fns(0,0) && func == 0) { if (!dev) break; } else { |