diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-07 19:55:23 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-07 19:55:23 +0200 |
| commit | b4e086f6797fd5319cce3df317eec28e34910d1d (patch) | |
| tree | 5c4a326852e621f4d2f8e946babda77db7a1dfc3 /arch/arm/mach-shmobile/board-lager.c | |
| parent | Merge tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: shmobile: r8a7790: Constify platform data and resources (diff) | |
| download | linux-b4e086f6797fd5319cce3df317eec28e34910d1d.tar.xz linux-b4e086f6797fd5319cce3df317eec28e34910d1d.zip | |
Merge tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
From Simon Horman:
Renesas ARM based SoC cleanups for v3.13
* Constify platform data and resources of r8a7790 SoC
* Rename to r8a7790_init_delay() as r8a7790_init_early()
- This is in preparation for doing more than just initialising the delay
* Rename r8a73a4_init_delay() as r8a73a4_init_early()
- This is in preparation for doing more than just initialising the delay
* tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790: Constify platform data and resources
ARM: shmobile: Rename to r8a7790_init_early()
ARM: shmobile: Rename to r8a73a4_init_early()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 5930af8d434f..6569491839cf 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -186,7 +186,7 @@ static const char *lager_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(LAGER_DT, "lager") - .init_early = r8a7790_init_delay, + .init_early = r8a7790_init_early, .init_time = r8a7790_timer_init, .init_machine = lager_init, .dt_compat = lager_boards_compat_dt, |