From: Stephen Warren <swarren@wwwdotorg.org>
Date: Tue, 15 Jan 2013 04:44:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6;p=deliverable%2Flinux.git

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

b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6
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();