diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 15:00:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 15:00:11 +0100 |
| commit | c182ce9bc8c85a623c71a23bcd6768045126c289 (patch) | |
| tree | 73fb6561bbec5d89cba74492c149f3012e275afa /drivers/platform/x86/wmi.c | |
| parent | 2da050e4f151c458df909780843067e7c2d11ec2 (diff) | |
| parent | a8750ddca918032d6349adbf9a4b6555e7db20da (diff) | |
Merge 4.15-rc8 into usb-next
We want the USB fixes in here as well for merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/x86/wmi.c')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 791449a2370f..daa68acbc900 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1458,5 +1458,5 @@ static void __exit acpi_wmi_exit(void) class_unregister(&wmi_bus_class); } -subsys_initcall(acpi_wmi_init); +subsys_initcall_sync(acpi_wmi_init); module_exit(acpi_wmi_exit); |