summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pasemi/pci.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-02-24 14:25:33 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-24 14:25:33 -0800
commitecd58d667a6ac4350d2f67b9accaadf575bae4b0 (patch)
tree5209771a0a1f61820171e444d3e4a580ecf3955f /arch/powerpc/platforms/pasemi/pci.c
parentb07f2ebc109b607789f648dedcff4b125f9afec6 (diff)
parentfb127cb9de791d62fb393d6e65fa9869bddd2460 (diff)
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
Diffstat (limited to 'arch/powerpc/platforms/pasemi/pci.c')
-rw-r--r--arch/powerpc/platforms/pasemi/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index b6a0ec45c69..b27d8861116 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -231,7 +231,7 @@ void __init pas_pci_init(void)
pci_devs_phb_init();
/* Use the common resource allocation mechanism */
- pci_probe_only = 1;
+ pci_add_flags(PCI_PROBE_ONLY);
}
void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)