git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
plip.c
diff --git
a/drivers/net/plip.c
b/drivers/net/plip.c
index
937b619
..
f4b6240
100644
(file)
--- a/
drivers/net/plip.c
+++ b/
drivers/net/plip.c
@@
-109,11
+109,11
@@
static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
#include <linux/ioport.h>
#include <linux/spinlock.h>
#include <linux/parport.h>
#include <linux/ioport.h>
#include <linux/spinlock.h>
#include <linux/parport.h>
+#include <linux/bitops.h>
#include <net/neighbour.h>
#include <asm/system.h>
#include <net/neighbour.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/irq.h>
#include <asm/byteorder.h>
#include <asm/semaphore.h>
#include <asm/irq.h>
#include <asm/byteorder.h>
#include <asm/semaphore.h>
@@
-1242,8
+1242,8
@@
plip_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
static int parport[PLIP_MAX] = { [0 ... PLIP_MAX-1] = -1 };
static int timid;
static int parport[PLIP_MAX] = { [0 ... PLIP_MAX-1] = -1 };
static int timid;
-
MODULE_PARM(parport, "1-" __MODULE_STRING(PLIP_MAX) "i"
);
-
MODULE_PARM(timid, "1i"
);
+
module_param_array(parport, int, NULL, 0
);
+
module_param(timid, int, 0
);
MODULE_PARM_DESC(parport, "List of parport device numbers to use by plip");
static struct net_device *dev_plip[PLIP_MAX] = { NULL, };
MODULE_PARM_DESC(parport, "List of parport device numbers to use by plip");
static struct net_device *dev_plip[PLIP_MAX] = { NULL, };