projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
board-ape6evm.c
diff --git
a/arch/arm/mach-shmobile/board-ape6evm.c
b/arch/arm/mach-shmobile/board-ape6evm.c
index 1585b8830b13b79a0908050e9a90fbb6489df674..b222f68d55b7251ef2d8da0e2fcd50005fdfdef4 100644
(file)
--- a/
arch/arm/mach-shmobile/board-ape6evm.c
+++ b/
arch/arm/mach-shmobile/board-ape6evm.c
@@
-283,7
+283,8
@@
static const char *ape6evm_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
};
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
- .init_early =
r8a73a4_init_earl
y,
+ .init_early =
shmobile_init_dela
y,
.init_machine = ape6evm_add_standard_devices,
.init_machine = ape6evm_add_standard_devices,
+ .init_late = shmobile_init_late,
.dt_compat = ape6evm_boards_compat_dt,
MACHINE_END
.dt_compat = ape6evm_boards_compat_dt,
MACHINE_END