Message ID | 20141216093931.14252.89982.sendpatchset@w520 (mailing list archive) |
---|---|
State | Accepted |
Commit | 1dc13eee3a5c60131657482aa88c997e5fa8b50c |
Headers | show |
--- 0001/arch/arm/mach-shmobile/smp-r8a7779.c +++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-12-16 18:24:44.000000000 +0900 @@ -56,7 +56,7 @@ static struct rcar_sysc_ch *r8a7779_ch_c [3] = &r8a7779_ch_cpu3, }; -#ifdef CONFIG_HAVE_ARM_TWD +#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM) static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29); void __init r8a7779_register_twd(void) {