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
This commit is contained in:
Linus Torvalds 2007-02-19 14:16:51 -08:00
commit 2aa6eb313e

View file

@ -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: