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
/
cpwatchdog.c
diff --git
a/drivers/sbus/char/cpwatchdog.c
b/drivers/sbus/char/cpwatchdog.c
index
9fcf180
..
c82abeb
100644
(file)
--- a/
drivers/sbus/char/cpwatchdog.c
+++ b/
drivers/sbus/char/cpwatchdog.c
@@
-165,11
+165,11
@@
static int wd1_timeout = 0;
static int wd2_timeout = 0;
#ifdef MODULE
static int wd2_timeout = 0;
#ifdef MODULE
-
MODULE_PARM (wd0_timeout, "i"
);
+
module_param (wd0_timeout, int, 0
);
MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");
MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");
-
MODULE_PARM (wd1_timeout, "i"
);
+
module_param (wd1_timeout, int, 0
);
MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs");
MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs");
-
MODULE_PARM (wd2_timeout, "i"
);
+
module_param (wd2_timeout, int, 0
);
MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs");
MODULE_AUTHOR
MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs");
MODULE_AUTHOR
@@
-743,7
+743,7
@@
ebus_done:
}
wd_dev.regs =
}
wd_dev.regs =
- ioremap(edev->resource[0].start,
sizeof(struct wd_regblk));
+ ioremap(edev->resource[0].start,
4 * WD_TIMER_REGSZ); /* ? */
if(NULL == wd_dev.regs) {
printk("%s: unable to map registers\n", WD_OBPNAME);
if(NULL == wd_dev.regs) {
printk("%s: unable to map registers\n", WD_OBPNAME);