From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 28 Jan 2013 17:20:34 +0000 (-0700)
Subject: Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3dab3989b4282e448cba0f0708934276dcb413a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
---

f3dab3989b4282e448cba0f0708934276dcb413a
diff --cc arch/arm/mach-highbank/highbank.c
index 981dc1e1da51,f6ca285ee5c5..41e254cac1ac
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -129,13 -129,9 +129,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();