diff options
| author | Linus Torvalds | 2007-02-19 23:16:51 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-02-19 23:16:51 +0100 |
| commit | 2aa6eb313e57a8254b17e60b8bb5e0a2570d7776 (patch) | |
| tree | 0e775fe39ef50f873264e2bd444da78a95f08684 | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [WATCHDOG] machzwd warning fix (diff) | |
| download | kernel-qcow2-linux-2aa6eb313e57a8254b17e60b8bb5e0a2570d7776.tar.gz kernel-qcow2-linux-2aa6eb313e57a8254b17e60b8bb5e0a2570d7776.tar.xz kernel-qcow2-linux-2aa6eb313e57a8254b17e60b8bb5e0a2570d7776.zip | |
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
| -rw-r--r-- | drivers/char/watchdog/machzwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index 81fb3dec180f..4a328ba0d262 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: |