Merge branch 'timer/cleanup' into late/mvebu2
Arnd Bergmann [Thu, 28 Feb 2013 17:54:15 +0000 (18:54 +0100)]
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.

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

16 files changed:
1  2 
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-dove/common.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/common.h
arch/arm/mach-kirkwood/dockstar-setup.c
arch/arm/mach-ks8695/board-acs5k.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-sunxi/sunxi.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/include/plat/cpu.h

Simple merge
@@@ -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();
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge