diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 12:27:35 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 12:27:35 +0200 |
commit | b24d0d5b12a678b96676348976982686fbe222b4 (patch) | |
tree | 565ce37d2d971cb94436241bc2ac48028b6b66d0 /drivers/firmware/dcdbas.c | |
parent | eeprom: at24: use SPDX identifier instead of GPL boiler-plate (diff) | |
parent | Linux 4.16-rc7 (diff) | |
download | linux-b24d0d5b12a678b96676348976982686fbe222b4.tar.xz linux-b24d0d5b12a678b96676348976982686fbe222b4.zip |
Merge 4.16-rc7 into char-misc-next
We want the hyperv fix in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/dcdbas.c')
-rw-r--r-- | drivers/firmware/dcdbas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index c16600f30611..0bdea60c65dd 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c @@ -639,7 +639,7 @@ static void __exit dcdbas_exit(void) platform_driver_unregister(&dcdbas_driver); } -module_init(dcdbas_init); +subsys_initcall_sync(dcdbas_init); module_exit(dcdbas_exit); MODULE_DESCRIPTION(DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")"); |