diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-13 00:40:56 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-13 00:40:56 +0200 |
| commit | d2919c651e750a58c3dd8b0183ac1b2700cdc01d (patch) | |
| tree | e58cf1c83459ddffe29e722ab2eef191bc9aacd8 /arch/arm/mach-shmobile/timer.c | |
| parent | Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | ARM / mach-shmobile: Invalidate caches when booting secondary cores (diff) | |
| download | linux-d2919c651e750a58c3dd8b0183ac1b2700cdc01d.tar.xz linux-d2919c651e750a58c3dd8b0183ac1b2700cdc01d.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into fixes
By Guennadi Liakhovetski (2) and others via Rafael J. Wysocki:
"[...] urgent fixes for Renesas ARM-based platforms. Four of these
commits are fixes of regressions new in 3.4-rc and the last one is
necessary for SMP to work on those systems in general."
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
ARM / mach-shmobile: Invalidate caches when booting secondary cores
ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
Diffstat (limited to 'arch/arm/mach-shmobile/timer.c')
| -rw-r--r-- | arch/arm/mach-shmobile/timer.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index 2fba5f3d1c8a..8b79e7917a23 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -46,15 +46,6 @@ 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, }; |