diff options
| author | Andrew Morton | 2007-02-17 12:13:07 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck | 2007-02-17 22:42:15 +0100 |
| commit | 420cff550fb1338bc946f1ccc8bb66f2d96ad1cb (patch) | |
| tree | e6c545abd41b14c16913a28134936fab3476c6ff | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| download | kernel-qcow2-linux-420cff550fb1338bc946f1ccc8bb66f2d96ad1cb.tar.gz kernel-qcow2-linux-420cff550fb1338bc946f1ccc8bb66f2d96ad1cb.tar.xz kernel-qcow2-linux-420cff550fb1338bc946f1ccc8bb66f2d96ad1cb.zip | |
[WATCHDOG] machzwd warning fix
From: Andrew Morton <akpm@linux-foundation.org>
drivers/char/watchdog/machzwd.c: In function 'zf_ioctl':
drivers/char/watchdog/machzwd.c:327: warning: passing argument 1 of 'zf_ping' makes integer from pointer without a cast
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -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: |