diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
tree | 3fb6b00359a63d8d2e33005599046c105956d314 /arch/arm/mach-omap2/cpuidle44xx.c | |
parent | a17fb8f520c3c662686aa54a86773f354002c7d3 (diff) | |
parent | e534e871a94ba2e3bfdf0edd3685eb805fc960d8 (diff) |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/cpuidle44xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index ee05e193fc6..288bee6cbb7 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -238,8 +238,9 @@ int __init omap4_idle_init(void) for_each_cpu(cpu_id, cpu_online_mask) { dev = &per_cpu(omap4_idle_dev, cpu_id); dev->cpu = cpu_id; +#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED dev->coupled_cpus = *cpu_online_mask; - +#endif cpuidle_register_driver(&omap4_idle_driver); if (cpuidle_register_device(dev)) { |