Commit e2efc25a authored Feb 09, 2013 by Olof Johansson

Merge tag 'renesas-soc4-for-v3.9' of...

Merge tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Fourth round of Renesas ARM-based SoC changes for v3.9

Register ARM architected timer.

This is preparatory work by Magnus Damm for SoC(s) that use
the ARM architected timer.

* tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Register ARM architected timer

parents 1087f4db dbe1c3de

arch/arm/mach-shmobile/timer.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	*/		*/
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/delay.h>		#include <linux/delay.h>
			#include <asm/arch_timer.h>
	#include <asm/mach/time.h>		#include <asm/mach/time.h>
	#include <asm/smp_twd.h>		#include <asm/smp_twd.h>

	@@ -62,4 +63,6 @@ void __init shmobile_earlytimer_init(void)

	void __init shmobile_timer_init(void)		void __init shmobile_timer_init(void)
	{		{
			arch_timer_of_register();
			arch_timer_sched_clock_init();
	}		}