diff options
| author | Olof Johansson <olof@lixom.net> | 2013-09-10 00:15:32 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-10 00:15:32 (GMT) |
| commit | afba951eab92ce43ff1fa1c3366cc6fec825936c (patch) | |
| tree | 155b9009da3a7d8fefd7e7e80e246de7070e0964 | |
| parent | d5ece9373c6e0f95ae59f303810e1ccbcd044629 (diff) | |
| parent | 7658ea2fb57831c6836ffcfb20bcb84f3ff55dfb (diff) | |
| download | linux-fsl-qoriq-afba951eab92ce43ff1fa1c3366cc6fec825936c.tar.xz | |
Merge tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
From Simon Horman:
Third Round of Renesas ARM based SoC fixes for v3.12
* Update early timer initialisation order of r8a7779 SoC
This resolves a regression introduced by
a894fcc2d01a89e6fe3da0845a4d80a5312e1124 ("ARM: smp_twd: Divorce smp_twd
from local timer API").
This problem was introduced in v3.10-rc2.
* tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Update early timer initialisation order
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index b5b2f78..ecd0148 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -691,8 +691,8 @@ void __init __weak r8a7779_register_twd(void) { } void __init r8a7779_earlytimer_init(void) { r8a7779_clock_init(); - shmobile_earlytimer_init(); r8a7779_register_twd(); + shmobile_earlytimer_init(); } void __init r8a7779_add_early_devices(void) |