aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 14:16:51 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 14:16:51 -0800
commit2aa6eb313e57a8254b17e60b8bb5e0a2570d7776 (patch)
tree0e775fe39ef50f873264e2bd444da78a95f08684 /drivers
parentcb553c480078759014096bc766dc76400e1d8397 (diff)
parent420cff550fb1338bc946f1ccc8bb66f2d96ad1cb (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] machzwd warning fix
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/machzwd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 81fb3dec180..4a328ba0d26 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -324,7 +324,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
return put_user(0, p);
case WDIOC_KEEPALIVE:
- zf_ping(NULL);
+ zf_ping(0);
break;
default: