From: Marc Zyngier <marc.zyngier@arm.com>
Date: Thu, 15 Mar 2012 11:05:39 +0000 (+0000)
Subject: ARM: ux500: fix compilation after local timer rework
X-Git-Tag: MMI-PSA29.97-13-9~17172^2~2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=218a28014112b20bd15a9e6305c8b46488830bc4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: ux500: fix compilation after local timer rework

mach-ux500/timer.c lacked the inclusion of mach/irqs.h, and thus
failed to compile. Fix it and also remove an unused variable.

Test compiled only.

Reported-by: Lee Jones <lee.jones@linaro.org>
Cc: Arnd Bergman <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index fbeed7e63393..e9d580702fbb 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);