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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
atari_pamsnet.c
diff --git
a/drivers/net/atari_pamsnet.c
b/drivers/net/atari_pamsnet.c
index
81c362c
..
d6039e6
100644
(file)
--- a/
drivers/net/atari_pamsnet.c
+++ b/
drivers/net/atari_pamsnet.c
@@
-119,7
+119,7
@@
static char *version =
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
-
MODULE_PARM(pamsnet_debug, "i"
);
+
module_param(pamsnet_debug, int, 0
);
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
@@
-165,7
+165,7
@@
static void pamsnet_tick(unsigned long);
static irqreturn_t pamsnet_intr(int irq, void *data, struct pt_regs *fp);
static irqreturn_t pamsnet_intr(int irq, void *data, struct pt_regs *fp);
-static
struct timer_list pamsnet_timer = TIMER_INITIALIZER(
pamsnet_tick, 0, 0);
+static
DEFINE_TIMER(pamsnet_timer,
pamsnet_tick, 0, 0);
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)