Commit 59ebc44e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pnp-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull PNP update from Rafael Wysocki:
 "One simple change to make the PNP core use device_initcall() instead
  of module_init() to run pnpbios_thread_init() (Paul Gortmaker)"

* tag 'pnp-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: make pnpbios core explicitly non-modular
parents e663107f 917c7fc2
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
*/ */
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -587,6 +586,6 @@ static int __init pnpbios_thread_init(void) ...@@ -587,6 +586,6 @@ static int __init pnpbios_thread_init(void)
} }
/* Start the kernel thread later: */ /* Start the kernel thread later: */
module_init(pnpbios_thread_init); device_initcall(pnpbios_thread_init);
EXPORT_SYMBOL(pnpbios_protocol); EXPORT_SYMBOL(pnpbios_protocol);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment