summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-10-02 02:43:41 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-10-02 02:43:41 +0400
commit5d85142b9e5264a925e4d582c3b0d7297d9c2713 (patch)
tree3cf8a4a0f968d30102e083c90b55a741b7083eeb
parent359c660e99d1431a9b08b240bfc31acc3d658efe (diff)
parentd61b0e87d2dfba3706dbbd6c7c6fd41c3d845685 (diff)
downloadlinux-5d85142b9e5264a925e4d582c3b0d7297d9c2713.tar.xz
Merge branch 'pci/resource' into next
* pci/resource: PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()
-rw-r--r--drivers/pci/setup-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6373985ad3f7..0482235eee92 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1652,7 +1652,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
struct pci_dev_resource *fail_res;
int retval;
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
- IORESOURCE_PREFETCH;
+ IORESOURCE_PREFETCH | IORESOURCE_MEM_64;
again:
__pci_bus_size_bridges(parent, &add_list);