git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[safe/jmp/linux-2.6]
/
drivers
/
watchdog
/
advantechwdt.c
diff --git
a/drivers/watchdog/advantechwdt.c
b/drivers/watchdog/advantechwdt.c
index
a1d7856
..
824d076
100644
(file)
--- a/
drivers/watchdog/advantechwdt.c
+++ b/
drivers/watchdog/advantechwdt.c
@@
-138,7
+138,9
@@
static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
void __user *argp = (void __user *)arg;
int __user *p = argp;
static struct watchdog_info ident = {
void __user *argp = (void __user *)arg;
int __user *p = argp;
static struct watchdog_info ident = {
- .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+ .options = WDIOF_KEEPALIVEPING |
+ WDIOF_SETTIMEOUT |
+ WDIOF_MAGICCLOSE,
.firmware_version = 1,
.identity = WATCHDOG_NAME,
};
.firmware_version = 1,
.identity = WATCHDOG_NAME,
};
@@
-259,7
+261,8
@@
static int __devinit advwdt_probe(struct platform_device *dev)
goto unreg_stop;
}
goto unreg_stop;
}
- /* Check that the heartbeat value is within it's range ; if not reset to the default */
+ /* Check that the heartbeat value is within it's range ;
+ * if not reset to the default */
if (advwdt_set_heartbeat(timeout)) {
advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
printk(KERN_INFO PFX
if (advwdt_set_heartbeat(timeout)) {
advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
printk(KERN_INFO PFX