Commit 2aa6eb31 authored Feb 19, 2007 by Linus Torvalds

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

drivers/char/watchdog/machzwd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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: