summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/82xx/pq2.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-20 12:36:59 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-07-20 12:36:59 -0400
commitc7e0c8535d73f8c5bf760926a2bd71c9840cf2ef (patch)
tree1386b9352b7b78bf1cb985463ab3aea30cb4288c /arch/powerpc/platforms/82xx/pq2.c
parentdfee09c8acf18e84fe197bb5d821d1e4e02d020f (diff)
parentef4669db0c9d5f06d5fd169fa461289723a93a91 (diff)
Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0
Diffstat (limited to 'arch/powerpc/platforms/82xx/pq2.c')
-rw-r--r--arch/powerpc/platforms/82xx/pq2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/82xx/pq2.c b/arch/powerpc/platforms/82xx/pq2.c
index 9761a59f175..d111b024eaf 100644
--- a/arch/powerpc/platforms/82xx/pq2.c
+++ b/arch/powerpc/platforms/82xx/pq2.c
@@ -53,7 +53,7 @@ static void __init pq2_pci_add_bridge(struct device_node *np)
if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
goto err;
- ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
+ pci_add_flags(PCI_REASSIGN_ALL_BUS);
hose = pcibios_alloc_controller(np);
if (!hose)