Merge branch 'local_timers-for-arm-soc' of...

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

parents 648ab3df 218a2801

arch/arm/mach-ux500/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);