diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/powerpc/platforms/44x/sam440ep.c | |
parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/powerpc/platforms/44x/sam440ep.c')
-rw-r--r-- | arch/powerpc/platforms/44x/sam440ep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c index a78e8eb6da41..9e09b835758b 100644 --- a/arch/powerpc/platforms/44x/sam440ep.c +++ b/arch/powerpc/platforms/44x/sam440ep.c @@ -51,7 +51,7 @@ static int __init sam440ep_probe(void) if (!of_flat_dt_is_compatible(root, "acube,sam440ep")) return 0; - ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); + pci_set_flags(PCI_REASSIGN_ALL_RSRC); return 1; } |