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
git-mirror · Feb 19, 2007 · 2aa6eb3 · 2aa6eb3
2 parents cb553c4 + 420cff5
commit 2aa6eb3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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: