diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
| commit | 429421a879dd2d62ac3573ba23d9faac162f5621 (patch) | |
| tree | 9eda98c6222bf72739b7b1a3a63a134296986235 /arch/arm64/kernel/cpu_ops.c | |
| parent | 8df8c7d7220e4ea159ca57edbf7f2c6cbf6a7278 (diff) | |
| parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-15.01
Diffstat (limited to 'arch/arm64/kernel/cpu_ops.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c index 04efea8fe4bc..24fb449bc6aa 100644 --- a/arch/arm64/kernel/cpu_ops.c +++ b/arch/arm64/kernel/cpu_ops.c @@ -30,8 +30,8 @@ const struct cpu_operations *cpu_ops[NR_CPUS]; static const struct cpu_operations *supported_cpu_ops[] __initconst = { #ifdef CONFIG_SMP &smp_spin_table_ops, - &cpu_psci_ops, #endif + &cpu_psci_ops, NULL, }; |