From ca779383df8ed554e545c4cbf61a7322a3f118fc Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Thu, 15 Mar 2012 11:05:39 +0000
Subject: [PATCH] --- yaml --- r: 295764 b: refs/heads/master c:
 218a28014112b20bd15a9e6305c8b46488830bc4 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-ux500/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9230e3cd131..0cc3d5fe23d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 648ab3df21add1bdfa21efeeb0b492ec45cb0a07
+refs/heads/master: 218a28014112b20bd15a9e6305c8b46488830bc4
diff --git a/trunk/arch/arm/mach-ux500/timer.c b/trunk/arch/arm/mach-ux500/timer.c
index fbeed7e63393..e9d580702fbb 100644
--- a/trunk/arch/arm/mach-ux500/timer.c
+++ b/trunk/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);