diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 05:13:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 05:13:00 -0700 |
| commit | 672a483050bd4fa733fb5854bd749d124f3e32a8 (patch) | |
| tree | af0269fd73241e69e7ffcf9ffa346d0b79e5c120 /include | |
| parent | 786501bbcef901e24a6648fe59017392df3ed1bf (diff) | |
| parent | 1f315b72ad795de4d971f675ba26f4387fadff79 (diff) | |
| download | history-672a483050bd4fa733fb5854bd749d124f3e32a8.tar.gz | |
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat_ioctl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index f8159ddb6194ab..0c246418176c34 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h @@ -592,13 +592,15 @@ COMPATIBLE_IOCTL(ATMTCP_CREATE) COMPATIBLE_IOCTL(ATMTCP_REMOVE) COMPATIBLE_IOCTL(ATMMPC_CTRL) COMPATIBLE_IOCTL(ATMMPC_DATA) -/* Big W */ -/* WIOC_GETSUPPORT not yet implemented -E */ +/* Watchdog */ +COMPATIBLE_IOCTL(WDIOC_GETSUPPORT) COMPATIBLE_IOCTL(WDIOC_GETSTATUS) COMPATIBLE_IOCTL(WDIOC_GETBOOTSTATUS) COMPATIBLE_IOCTL(WDIOC_GETTEMP) COMPATIBLE_IOCTL(WDIOC_SETOPTIONS) COMPATIBLE_IOCTL(WDIOC_KEEPALIVE) +COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT) +COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT) /* Big R */ COMPATIBLE_IOCTL(RNDGETENTCNT) COMPATIBLE_IOCTL(RNDADDTOENTCNT) |