diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-07 00:35:18 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-07 00:35:18 +0200 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /drivers/pci/setup-bus.c | |
| parent | [IA64] restore_sigcontext is not preempt safe (diff) | |
| parent | [PATCH] Fix bt87x.c build problem for real (diff) | |
| download | linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.xz linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6b628de948af..c1bdfb424658 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -273,6 +273,8 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type) for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { r = bus->resource[i]; + if (r == &ioport_resource || r == &iomem_resource) + continue; if (r && (r->flags & type_mask) == type && !r->parent) return r; } |