summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/timer.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-30 04:05:48 +0400
committerOlof Johansson <olof@lixom.net>2013-01-30 04:06:03 +0400
commit0b79f2772a0c49266e611a36d55a2d0e2a241929 (patch)
treecbb54756a3d47ecba7162741756609ce1a3229d6 /arch/arm/mach-ux500/timer.c
parent1576a31c61d41a0bb549a3aabd10f42c5e233de4 (diff)
parent7a4f26097d389c16c9956bc03b81532698d97d64 (diff)
downloadlinux-0b79f2772a0c49266e611a36d55a2d0e2a241929.tar.xz
Merge tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
From Linus Walleij: Removal of the <mach/id.h> include from ux500 - First an ACKed MFD patch deleting the only consumer of these cpu_is* functions outside of mach-ux500 - Introduce a new local cpu_is_u8580() in this patch set to avoid clashing with other patch sets. - Finally de-globalize <mach/id.h>. * tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: de-globalize <mach/id.h> ARM: ux500: Introduce cpu_is_u8580() mfd: prcmu: delete pin control helpers Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
-rw-r--r--arch/arm/mach-ux500/timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index aa2a78acb59e..a6af0b8732ba 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -17,6 +17,8 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
+#include "id.h"
+
#ifdef CONFIG_HAVE_ARM_TWD
static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
U8500_TWD_BASE, IRQ_LOCALTIMER);