From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 19 Mar 2012 20:46:32 +0000 (+0000)
Subject: Merge branch 'renesas/timer' into next/timer
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc;p=linux.git

Merge branch 'renesas/timer' into next/timer

Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

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

b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc
diff --cc arch/arm/mach-shmobile/include/mach/common.h
index 9fde3eb686a67,e41b61a48439b..83ad3fe0a75fc
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -1,9 -1,8 +1,10 @@@
  #ifndef __ARCH_MACH_COMMON_H
  #define __ARCH_MACH_COMMON_H
  
+ extern void shmobile_earlytimer_init(void);
  extern struct sys_timer shmobile_timer;
 +struct twd_local_timer;
 +void shmobile_twd_init(struct twd_local_timer *twd_local_timer);
  extern void shmobile_setup_console(void);
  extern void shmobile_secondary_vector(void);
  extern int shmobile_platform_cpu_kill(unsigned int cpu);
diff --cc arch/arm/mach-shmobile/timer.c
index be16231e86fc6,be1ad70fe404d..2fba5f3d1c8ad
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@@ -42,15 -41,10 +42,19 @@@ void __init shmobile_earlytimer_init(vo
  	late_time_init = shmobile_late_time_init;
  }
  
+ static void __init shmobile_timer_init(void)
+ {
+ }
+ 
 +void __init shmobile_twd_init(struct twd_local_timer *twd_local_timer)
 +{
 +#ifdef CONFIG_HAVE_ARM_TWD
 +	int err = twd_local_timer_register(twd_local_timer);
 +	if (err)
 +		pr_err("twd_local_timer_register failed %d\n", err);
 +#endif
 +}
 +
  struct sys_timer shmobile_timer = {
  	.init		= shmobile_timer_init,
  };