diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 04:31:20 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 04:31:20 +0400 |
| commit | 63862f14bdf9e1251b7398947265422ec9b1400b (patch) | |
| tree | fdf5ccd215cfa23792964fbff600116788349d20 /arch/arm/mach-shmobile/board-ape6evm.c | |
| parent | b77c6bcef2082a7cd96124daf15df8da5b670ebe (diff) | |
| parent | 2349199db55bfb99e2ebdce285a7e297ba63a7ef (diff) | |
| download | linux-63862f14bdf9e1251b7398947265422ec9b1400b.tar.xz | |
Merge branch 'heads/soc2' into boards2-base
Diffstat (limited to 'arch/arm/mach-shmobile/board-ape6evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ape6evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 0365d2e2e730..7627385f516e 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -279,7 +279,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(APE6EVM_DT, "ape6evm") - .init_early = r8a73a4_init_delay, + .init_early = r8a73a4_init_early, .init_machine = ape6evm_add_standard_devices, .dt_compat = ape6evm_boards_compat_dt, MACHINE_END |