diff options
| author | Corey Minyard <cminyard@mvista.com> | 2017-11-02 11:19:15 -0500 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-11-02 11:19:15 -0500 |
| commit | 6297fabd93f93182245383ba7de56bef829a796b (patch) | |
| tree | 804f5d28ada61b402d56281c9a047308d26347f4 /arch/arm64/kernel/cpufeature.c | |
| parent | d7e17fe4f7a7d961cc4375c7d868bd353a039bc7 (diff) | |
| parent | ece1996a21eeb344b49200e627c6660111009c10 (diff) | |
| download | talos-obmc-linux-6297fabd93f93182245383ba7de56bef829a796b.tar.gz talos-obmc-linux-6297fabd93f93182245383ba7de56bef829a796b.zip | |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'arch/arm64/kernel/cpufeature.c')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index cd52d365d1f0..21e2c95d24e7 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1307,4 +1307,4 @@ static int __init enable_mrs_emulation(void) return 0; } -late_initcall(enable_mrs_emulation); +core_initcall(enable_mrs_emulation); |
