diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-20 07:39:05 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-20 07:39:05 +0200 |
| commit | b4c6ed1386c6f6d327cd8e6312d5126fd8370192 (patch) | |
| tree | 77377f3d9459afcdd38d61562c02c2a0dc98f6df /arch/arm/mach-shmobile | |
| parent | Merge tag 'mvebu-defconfig-3.16' of git://git.infradead.org/linux-mvebu into ... (diff) | |
| parent | ARM: shmobile: Minor cleanup of the Armadillo legacy board code (diff) | |
| download | linux-b4c6ed1386c6f6d327cd8e6312d5126fd8370192.tar.xz linux-b4c6ed1386c6f6d327cd8e6312d5126fd8370192.zip | |
Merge tag 'renesas-boards2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Second Round of Renesas ARM Based SoC Boards Updates for v3.16" from
Simon Horman:
r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Minor cleanup of the Armadillo legacy board code
* tag 'renesas-boards2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Minor cleanup of the Armadillo legacy board code
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 486063db2a2f..48a1453b3378 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1300,11 +1300,6 @@ static void __init eva_earlytimer_init(void) eva_clock_init(); } -static void __init eva_add_early_devices(void) -{ - r8a7740_add_early_devices(); -} - #define RESCNT2 IOMEM(0xe6188020) static void eva_restart(enum reboot_mode mode, const char *cmd) { @@ -1319,7 +1314,7 @@ static const char *eva_boards_compat_dt[] __initdata = { DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") .map_io = r8a7740_map_io, - .init_early = eva_add_early_devices, + .init_early = r8a7740_add_early_devices, .init_irq = r8a7740_init_irq_of, .init_machine = eva_init, .init_late = shmobile_init_late, |