Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72a9cdd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 72d39926 e4dca0fe

drivers/pnp/isapnp/core.c

+1 −4
Original line number Diff line number Diff line
@@ -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