diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-03-04 13:57:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-21 00:47:04 -0400 |
commit | b81d988c04cacb1f7ffb76cbff2d150eb9f02948 (patch) | |
tree | ade4c270f2479c53d7bd8d35bdda050caaa82cc8 /arch/x86/pci/common.c | |
parent | 842de40d93e00a5c40a1a7f520a6fbe422994e99 (diff) |
PCI: x86: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/pci/common.c')
-rw-r--r-- | arch/x86/pci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 900e1a78c3e4..75fcc29ecf52 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -466,7 +466,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
466 | { | 466 | { |
467 | int err; | 467 | int err; |
468 | 468 | ||
469 | if ((err = pcibios_enable_resources(dev, mask)) < 0) | 469 | if ((err = pci_enable_resources(dev, mask)) < 0) |
470 | return err; | 470 | return err; |
471 | 471 | ||
472 | if (!dev->msi_enabled) | 472 | if (!dev->msi_enabled) |