Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

PNP update for v4.9-rc1

Browse Source 
This makes more PNP core code explicitly non-modular (Paul Gortmaker).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCAAGBQJX8Y7tAAoJEILEb/54YlRxgdUP/1Eud/CyM1w0OUzkNmcB12R7
 m21KrfjECUcCp7MMGtVRgCGZsF0wk/Rw2/PSZ/Ccv9+PtV9y0KJ029rgMWDVRfEl
 jxdepxLwkvoPQpsYZGusIWiSWVfLexNRgh9qGNKsb1PaIzxvN0naboW0Pj8cU8MX
 MsqtFeco4uxP1VCIlV5uLKqT/E1Z2YJYXbKrwaV0aNIeIpH85GLinkiCjPDKM8bR
 klAX4DPHYMfluHGRrw/3z5hEKjDviHRcSj6i2as8TLzyMGIZHk/pUetYcf1iWo7p
 qwupm0pwgHQqv4jtdpnaISHDXUgc+DRKAuP5fxdKoUpdRuVaniPon/XjnfydUoy5
 DZ4IiRie5D3U3EeZzehUGxSRUE5h+nyW7lSIZ7vs4l32YmAjiednJ3dQSOR/XNP+
 vdC0yummzwtHlip6p3Gg1lSc9OjcoQoJYdKONNweZHU0sowrhKjBucjvMyWSGG8C
 a0wNZSyR3dF+HA+3RUNkzAm6tUy/B6L1HHhMpK18KEizmyA/zNGGDzmqYC4GBqCx
 viPQ40WiEUOdXpBmiK1V+Byrnm/H3juacR1flX89Wa8GvttYolKlVgOw8/UmgDW0
 ZCrBPqPxpE68lSwaCDCMLWv34+Gb5g2Wcy5eiM3e7rJBoXvNCXXXasgetN501Mwr
 lzCE9Z4F0PKyg/iXwUyN
 =LqvL
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2016-10-03 10:27:49 -07:00
commit 72a9cdd083
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pnp/isapnp/core.c
View File

@ -34,7 +34,7 @@
* 2003-08-11 Resource Management Updates - Adam Belay <ambx1@neo.rr.com> * 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/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/delay.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_reset = 1; /* reset all PnP cards (deactivate) */
static int isapnp_verbose = 1; /* verbose mode */ 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_param(isapnp_disable, int, 0);
MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable"); MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable");
module_param(isapnp_rdp, int, 0); 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_PARM_DESC(isapnp_reset, "ISA Plug & Play reset all cards");
module_param(isapnp_verbose, int, 0); module_param(isapnp_verbose, int, 0);
MODULE_PARM_DESC(isapnp_verbose, "ISA Plug & Play verbose mode"); MODULE_PARM_DESC(isapnp_verbose, "ISA Plug & Play verbose mode");
MODULE_LICENSE("GPL");
#define _PIDXR 0x279 #define _PIDXR 0x279
#define _PNPWRP 0xa79 #define _PNPWRP 0xa79