diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-03 16:54:10 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-03 16:54:10 +0100 |
commit | ab011d7e171ff7fb5f51a4098e2a7dac0bc9670f (patch) | |
tree | 9e2a5375a16fa47cd3bf177f1b942ec1b524951e /arch/frv/mb93090-mb00/pci-frv.c | |
parent | f463cd2d5a197d1dae6d2c0720359a979836d74d (diff) | |
parent | 6b96d705f3cf435b0b8835b12c9742513c77fed6 (diff) |
Merge remote-tracking branch 'origin/drm-intel-fixes' into drm-intel-nightly
Diffstat (limited to 'arch/frv/mb93090-mb00/pci-frv.c')
-rw-r--r-- | arch/frv/mb93090-mb00/pci-frv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index 67b1d1685759..0635bd6c2af3 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c @@ -94,7 +94,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) r = &dev->resource[idx]; if (!r->start) continue; - pci_claim_resource(dev, idx); + pci_claim_bridge_resource(dev, idx); } } pcibios_allocate_bus_resources(&bus->children); |