diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 16:28:50 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 16:28:50 +0200 |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /arch/arm/kernel/setup.c | |
| parent | Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into ... (diff) | |
| parent | Merge branch 'psci/for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.xz linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index e2ecee6b70ca..20edd349d379 100644 --- 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()) { |