diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 13:45:53 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 13:45:53 +0000 |
| commit | c0206e228e34d8b414fcc63db45b831843adea06 (patch) | |
| tree | 937c005d696e4e141ac52233a73630f6fdab4ef6 | |
| parent | 648ab3df21add1bdfa21efeeb0b492ec45cb0a07 (diff) | |
| parent | 218a28014112b20bd15a9e6305c8b46488830bc4 (diff) | |
| download | linux-3.10-c0206e228e34d8b414fcc63db45b831843adea06.tar.gz linux-3.10-c0206e228e34d8b414fcc63db45b831843adea06.tar.bz2 linux-3.10-c0206e228e34d8b414fcc63db45b831843adea06.zip | |
Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into next/timer
* 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
ARM: ux500: fix compilation after local timer rework
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index fbeed7e6339..e9d580702fb 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -14,6 +14,7 @@ #include <mach/setup.h> #include <mach/hardware.h> +#include <mach/irqs.h> #ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(u5500_twd_local_timer, @@ -41,7 +42,6 @@ static void __init ux500_timer_init(void) { void __iomem *mtu_timer_base; void __iomem *prcmu_timer_base; - int err; if (cpu_is_u5500()) { mtu_timer_base = __io_address(U5500_MTU0_BASE); |