git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
smp-r8a7779.c
diff --git
a/arch/arm/mach-shmobile/smp-r8a7779.c
b/arch/arm/mach-shmobile/smp-r8a7779.c
index
3f761f8
..
9fc280e
100644
(file)
--- 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,
};
-#if
def 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)
{