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
/
sbus
/
char
/
riowatchdog.c
diff --git
a/drivers/sbus/char/riowatchdog.c
b/drivers/sbus/char/riowatchdog.c
index
7f8e109
..
d1babff
100644
(file)
--- a/
drivers/sbus/char/riowatchdog.c
+++ b/
drivers/sbus/char/riowatchdog.c
@@
-52,14
+52,14
@@
MODULE_LICENSE("GPL");
#define RIOWD_NAME "pmc"
#define RIOWD_MINOR 215
#define RIOWD_NAME "pmc"
#define RIOWD_MINOR 215
-static
spinlock_t riowd_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(riowd_lock)
;
-static void *bbc_regs;
-static void *riowd_regs;
+static void
__iomem
*bbc_regs;
+static void
__iomem
*riowd_regs;
#define WDTO_INDEX 0x05
static int riowd_timeout = 1; /* in minutes */
#define WDTO_INDEX 0x05
static int riowd_timeout = 1; /* in minutes */
-
MODULE_PARM(riowd_timeout,"i"
);
+
module_param(riowd_timeout, int, 0
);
MODULE_PARM_DESC(riowd_timeout, "Watchdog timeout in minutes");
#if 0 /* Currently unused. */
MODULE_PARM_DESC(riowd_timeout, "Watchdog timeout in minutes");
#if 0 /* Currently unused. */