aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-23 13:05:22 +0100
committerMark Brown <broonie@linaro.org>2014-07-23 13:05:22 +0100
commitffdb45e3fc6abd568ea193a1fa885ab58290b5cc (patch)
treeffe7d7e42b6960c852d615eab7ab5bbcba6bfa97 /arch/arm64/kernel
parentf017c869c5cd04a5279767de1014062031a9aa2f (diff)
parent73cc7ba0f2e856ad90ab0ec8700826b9f0df219a (diff)
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-cmadma' into lsk-v3.14-arm64-misc
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index c8e9effe52e1..43f690f4a826 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -360,7 +360,7 @@ static int __init arm64_device_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
return 0;
}
-arch_initcall(arm64_device_init);
+arch_initcall_sync(arm64_device_init);
static DEFINE_PER_CPU(struct cpu, cpu_data);