From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 28 Feb 2013 17:54:15 +0000 (+0100)
Subject: Merge branch 'timer/cleanup' into late/mvebu2
X-Git-Tag: v3.9-rc1~35^2~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7266d48fca8ee2a15d15222c41f887e10db54c5a;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'timer/cleanup' into late/mvebu2

Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

7266d48fca8ee2a15d15222c41f887e10db54c5a
diff --cc arch/arm/mach-highbank/highbank.c
index 981dc1e,f6ca285..41e254c
--- 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();