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
/
char
/
lp.c
diff --git
a/drivers/char/lp.c
b/drivers/char/lp.c
index
6110dbf
..
92a54cb
100644
(file)
--- a/
drivers/char/lp.c
+++ b/
drivers/char/lp.c
@@
-142,7
+142,7
@@
/* ROUND_UP macro from fs/select.c */
#define ROUND_UP(x,y) (((x)+(y)-1)/(y))
/* ROUND_UP macro from fs/select.c */
#define ROUND_UP(x,y) (((x)+(y)-1)/(y))
-struct lp_struct lp_table[LP_NO];
+st
atic st
ruct lp_struct lp_table[LP_NO];
static unsigned int lp_count = 0;
static struct class_simple *lp_class;
static unsigned int lp_count = 0;
static struct class_simple *lp_class;
@@
-749,8
+749,8
@@
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
static char *parport[LP_NO] = { NULL, };
static int reset = 0;
static char *parport[LP_NO] = { NULL, };
static int reset = 0;
-
MODULE_PARM(parport, "1-" __MODULE_STRING(LP_NO) "s"
);
-
MODULE_PARM(reset, "i"
);
+
module_param_array(parport, charp, NULL, 0
);
+
module_param(reset, bool, 0
);
#ifndef MODULE
static int __init lp_setup (char *str)
#ifndef MODULE
static int __init lp_setup (char *str)
@@
-867,7
+867,7
@@
static struct parport_driver lp_driver = {
.detach = lp_detach,
};
.detach = lp_detach,
};
-int __init lp_init (void)
+
static
int __init lp_init (void)
{
int i, err = 0;
{
int i, err = 0;