diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 14:23:57 +0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 14:23:57 +0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/char/watchdog/machzwd.c | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
| download | linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/watchdog/machzwd.c')
| -rw-r--r-- | drivers/char/watchdog/machzwd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index a0d27160c80e..6d35bb112a5f 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/char/watchdog/machzwd.c @@ -321,6 +321,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, break; case WDIOC_GETSTATUS: + case WDIOC_GETBOOTSTATUS: return put_user(0, p); case WDIOC_KEEPALIVE: |