diff options
author | Dave Jones <davej@redhat.com> | 2006-12-13 00:13:32 +0100 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-12-13 00:13:32 +0100 |
commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/watchdog/booke_wdt.c | |
parent | [AGPGART] VIA and SiS AGP chipsets are x86-only (diff) | |
parent | [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff) | |
download | linux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.tar.xz linux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.zip |
Merge ../linus
Diffstat (limited to 'drivers/char/watchdog/booke_wdt.c')
-rw-r--r-- | drivers/char/watchdog/booke_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c index e3cefc538b40..488902231cc2 100644 --- a/drivers/char/watchdog/booke_wdt.c +++ b/drivers/char/watchdog/booke_wdt.c @@ -125,7 +125,7 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file, return -EINVAL; return 0; default: - return -ENOIOCTLCMD; + return -ENOTTY; } return 0; |