diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-12-16 18:39:31 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-12-21 17:11:20 +0900 |
| commit | 1dc13eee3a5c60131657482aa88c997e5fa8b50c (patch) | |
| tree | cbea489ea199ed63ad139d1fef2331fd9c5876d6 /arch | |
| parent | 95abc9de7896bf65e67bf781d709ec453f1f5f84 (diff) | |
| download | linux-stable-1dc13eee3a5c60131657482aa88c997e5fa8b50c.tar.gz linux-stable-1dc13eee3a5c60131657482aa88c997e5fa8b50c.tar.bz2 linux-stable-1dc13eee3a5c60131657482aa88c997e5fa8b50c.zip | |
ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform
Skip the TWD setup in C for r8a7779 Multiplatform.
We should use DTS for the TWD device anyway.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7779.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c index 3f761f839043..9fc280e24ef4 100644 --- a/arch/arm/mach-shmobile/smp-r8a7779.c +++ b/arch/arm/mach-shmobile/smp-r8a7779.c @@ -56,7 +56,7 @@ static struct rcar_sysc_ch *r8a7779_ch_cpu[4] = { [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) { |