From: Tony Lindgren <tony@atomide.com>
Date: Fri, 21 Sep 2012 20:48:01 +0000 (-0700)
Subject: Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux... 
X-Git-Tag: v3.7-rc1~159^2~2^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c9de3c52d2baed6bc2ee44885adb418152c71c4;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
	arch/arm/mach-omap2/timer.c
---

0c9de3c52d2baed6bc2ee44885adb418152c71c4
diff --cc arch/arm/mach-omap2/timer.c
index e2084facca592,2c5a45d8ca8c4..a9c9b3dbc82c5
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -36,19 -36,17 +36,20 @@@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
  
  #include <asm/mach/time.h>
 -#include <plat/dmtimer.h>
  #include <asm/smp_twd.h>
  #include <asm/sched_clock.h>
 +
+ #include <asm/arch_timer.h>
 -#include "common.h"
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
 +#include <plat/dmtimer.h>
  #include <plat/omap-pm.h>
  
 +#include "soc.h"
 +#include "common.h"
  #include "powerdomain.h"
  
  /* Parent clocks, eventually these will come from the clock framework */