diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/watchdog/wdt977.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/char/watchdog/wdt977.c')
| -rw-r--r-- | drivers/char/watchdog/wdt977.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c index a0935bc775f8..6253041b235b 100644 --- a/drivers/char/watchdog/wdt977.c +++ b/drivers/char/watchdog/wdt977.c | |||
| @@ -361,7 +361,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file, | |||
| 361 | switch(cmd) | 361 | switch(cmd) |
| 362 | { | 362 | { |
| 363 | default: | 363 | default: |
| 364 | return -ENOIOCTLCMD; | 364 | return -ENOTTY; |
| 365 | 365 | ||
| 366 | case WDIOC_GETSUPPORT: | 366 | case WDIOC_GETSUPPORT: |
| 367 | return copy_to_user(uarg.ident, &ident, | 367 | return copy_to_user(uarg.ident, &ident, |