From: Rob Herring <rob.herring@calxeda.com>
Date: Mon, 24 Oct 2011 19:02:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'rmk/devel-stable' into HEAD
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3a8254364277fabe01bc0e12b9691722939f5ef3;p=~shefty%2Frdma-dev.git

Merge remote-tracking branch 'rmk/devel-stable' into HEAD
---

3a8254364277fabe01bc0e12b9691722939f5ef3
diff --cc arch/arm/mach-exynos4/mct.c
index ddd86864fb8,85a1bb79f11..582b874aab0
--- a/arch/arm/mach-exynos4/mct.c
+++ b/arch/arm/mach-exynos4/mct.c
@@@ -395,16 -391,15 +397,17 @@@ static void exynos4_mct_tick_init(struc
  }
  
  /* Setup the local clock events for a CPU */
 -void __cpuinit local_timer_setup(struct clock_event_device *evt)
 +int __cpuinit local_timer_setup(struct clock_event_device *evt)
  {
  	exynos4_mct_tick_init(evt);
 +
 +	return 0;
  }
  
- int local_timer_ack(void)
+ void local_timer_stop(struct clock_event_device *evt)
  {
- 	return 0;
+ 	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+ 	disable_irq(evt->irq);
  }
  
  #endif /* CONFIG_LOCAL_TIMERS */