summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-02-17 03:13:07 -0800
committerWim Van Sebroeck <wim@iguana.be>2007-02-17 22:42:15 +0100
commit420cff550fb1338bc946f1ccc8bb66f2d96ad1cb (patch)
treee6c545abd41b14c16913a28134936fab3476c6ff /drivers
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
downloadop-kernel-dev-420cff550fb1338bc946f1ccc8bb66f2d96ad1cb.zip
op-kernel-dev-420cff550fb1338bc946f1ccc8bb66f2d96ad1cb.tar.gz
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/machzwd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 81fb3de..4a328ba 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:
OpenPOWER on IntegriCloud