diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-25 01:10:02 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-25 01:10:02 +0200 |
| commit | 54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 (patch) | |
| tree | 924613494fac61514c0fc806920ed5032f2322a6 /arch/arm/mach-mvebu/platsmp.c | |
| parent | ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init() (diff) | |
| parent | ARM: mvebu: add cpuidle support for Armada 38x (diff) | |
| download | linux-54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743.tar.xz linux-54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743.zip | |
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
Conflicts:
arch/arm/mach-mvebu/pmsu.c
Diffstat (limited to 'arch/arm/mach-mvebu/platsmp.c')
| -rw-r--r-- | arch/arm/mach-mvebu/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c index f278acebeaeb..895dc373c8a1 100644 --- a/arch/arm/mach-mvebu/platsmp.c +++ b/arch/arm/mach-mvebu/platsmp.c @@ -109,7 +109,7 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle) */ static void armada_xp_secondary_init(unsigned int cpu) { - armada_370_xp_pmsu_idle_exit(); + mvebu_v7_pmsu_idle_exit(); } static void __init armada_xp_smp_init_cpus(void) |