diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:27:49 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:27:49 (GMT) |
| commit | 72a9cdd083005900f15934e8568f1ac43a6bb755 (patch) | |
| tree | 14f3cbc569e43ccc7a729221734c3af39436cf7b | |
| parent | 72d39926f098b0c4ad95e1461595a8d6d403c14d (diff) | |
| parent | e4dca0febfb213d01466c400f54b01a556372120 (diff) | |
| download | linux-72a9cdd083005900f15934e8568f1ac43a6bb755.tar.xz | |
Merge tag 'pnp-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull PNP update from Rafael Wysocki:
"This makes more PNP core code explicitly non-modular (Paul Gortmaker)"
* tag 'pnp-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PNP: isapnp: make core more explicitly non-modular
| -rw-r--r-- | drivers/pnp/isapnp/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index cf88f9b6..d8bf5a1 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c @@ -34,7 +34,7 @@ * 2003-08-11 Resource Management Updates - Adam Belay <ambx1@neo.rr.com> */ -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/delay.h> @@ -54,8 +54,6 @@ static int isapnp_rdp; /* Read Data Port */ static int isapnp_reset = 1; /* reset all PnP cards (deactivate) */ static int isapnp_verbose = 1; /* verbose mode */ -MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); -MODULE_DESCRIPTION("Generic ISA Plug & Play support"); module_param(isapnp_disable, int, 0); MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable"); module_param(isapnp_rdp, int, 0); @@ -64,7 +62,6 @@ module_param(isapnp_reset, int, 0); MODULE_PARM_DESC(isapnp_reset, "ISA Plug & Play reset all cards"); module_param(isapnp_verbose, int, 0); MODULE_PARM_DESC(isapnp_verbose, "ISA Plug & Play verbose mode"); -MODULE_LICENSE("GPL"); #define _PIDXR 0x279 #define _PNPWRP 0xa79 |