diff options
| author |   Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-10-15 16:50:48 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:06:54 -0700 |
| commit | 9bd8f9c638c51313328d664a2f7a5e413cfd9044 (patch) | |
| tree | ef26a00bcc5ebea843a5e0ae4afeb4518960d39d /arch/frv/mb93090-mb00/pci-vdk.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (diff) | |
| download | linux-dev-9bd8f9c638c51313328d664a2f7a5e413cfd9044.tar.xz linux-dev-9bd8f9c638c51313328d664a2f7a5e413cfd9044.zip | |
frv: 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 PCI_NUM_RESOURCES (11), not 6, resources
- skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
- skips ROM resources unless IORESOURCE_ROM_ENABLE is set
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv/mb93090-mb00/pci-vdk.c')
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-vdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index f003cfa68b7a..0f41c3a72da5 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c @@ -412,7 +412,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) { int err; - if ((err = pcibios_enable_resources(dev, mask)) < 0) + if ((err = pci_enable_resources(dev, mask)) < 0) return err; if (!dev->msi_enabled) pcibios_enable_irq(dev); |