diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 18:27:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 18:27:20 -0700 |
| commit | 59ebc44e8dac359812f317473c4f05cd1432f5d2 (patch) | |
| tree | 2d7f0541dcd4211386bfe6c321d5e2695af2deed | |
| parent | e663107fa1edda4d8a0d5b8ce704d71f8e27de43 (diff) | |
| parent | 917c7fc264abb9c470486b157bc7252e53f68fbb (diff) | |
| download | linux-59ebc44e8dac359812f317473c4f05cd1432f5d2.tar.gz linux-59ebc44e8dac359812f317473c4f05cd1432f5d2.tar.bz2 linux-59ebc44e8dac359812f317473c4f05cd1432f5d2.zip | |
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
| -rw-r--r-- | drivers/pnp/pnpbios/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index 81603d99082b..bedb361746a0 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c @@ -46,7 +46,6 @@ */ #include <linux/types.h> -#include <linux/module.h> #include <linux/init.h> #include <linux/linkage.h> #include <linux/kernel.h> @@ -587,6 +586,6 @@ static int __init pnpbios_thread_init(void) } /* Start the kernel thread later: */ -module_init(pnpbios_thread_init); +device_initcall(pnpbios_thread_init); EXPORT_SYMBOL(pnpbios_protocol); |