Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[mv-sheeva.git] / drivers / char / watchdog / machzwd.c

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 4a328ba0d262279baaec50eda6430c926461fc0d..81fb3dec180f5be0b5076568b3c140caa6393d4f 100644 (file)
--- 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(0);
+                       zf_ping(NULL);
                        break;
 
                default: