Merge branch 'devel-stable' into for-linus

[karo-tx-linux.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index e2ecee6b70ca487f8f38407381bb77155bb3b786..20edd349d379f22c583438db7fbf52f46e1133ef 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -31,6 +31,7 @@
 #include <linux/bug.h>
 #include <linux/compiler.h>
 #include <linux/sort.h>
+#include <linux/psci.h>
 
 #include <asm/unified.h>
 #include <asm/cp15.h>
@@ -976,7 +977,7 @@ void __init setup_arch(char **cmdline_p)
        unflatten_device_tree();
 
        arm_dt_init_cpu_maps();
-       psci_init();
+       psci_dt_init();
        xen_early_init();
 #ifdef CONFIG_SMP
        if (is_smp()) {