From: Jon Hunter <jon-hunter@ti.com>
Date: Mon, 1 Apr 2013 18:47:29 +0000 (-0500)
Subject: Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
X-Git-Tag: v3.10-rc1~102^2~20^2^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d61aecee8f32259920cdf90a452fa26ffc64e9f;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
---

2d61aecee8f32259920cdf90a452fa26ffc64e9f
diff --cc arch/arm/mach-highbank/highbank.c
index e6c0612,f6ca285..ff7a4fa
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -130,13 -129,9 +130,9 @@@ static void __init highbank_timer_init(
  	arch_timer_sched_clock_init();
  }
  
- static struct sys_timer highbank_timer = {
- 	.init = highbank_timer_init,
- };
- 
  static void highbank_power_off(void)
  {
 -	hignbank_set_pwr_shutdown();
 +	highbank_set_pwr_shutdown();
  
  	while (1)
  		cpu_do_idle();