diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:48:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:48:07 -0400 |
| commit | b65d04a7859f4cfea1a40de260cb52d8f7897aff (patch) | |
| tree | 886fac4aceeccebf0c3a2f9ad04001692b40d20f /drivers/char/watchdog/pcwd.c | |
| parent | 0235497f7a961db57ef975eb889503809ce82fe5 (diff) | |
| parent | 11dc10195aed0636d9a60907594b349424b933a7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] improve machzwd detection
[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
[WATCHDOG] s3c24XX nowayout
[WATCHDOG] pnx4008: add cpu_relax()
[WATCHDOG] pnx4008_wdt.c - spinlock fixes.
[WATCHDOG] pnx4008_wdt.c - remove patch
[WATCHDOG] pnx4008_wdt.c - nowayout patch
[WATCHDOG] pnx4008: add watchdog support
[WATCHDOG] i8xx_tco remove pci_find_device.
[WATCHDOG] alim remove pci_find_device
Diffstat (limited to 'drivers/char/watchdog/pcwd.c')
| -rw-r--r-- | drivers/char/watchdog/pcwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c index cd7d1b6a5d9f..6f8515db5b07 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c | |||
| @@ -572,7 +572,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file, | |||
| 572 | 572 | ||
| 573 | switch(cmd) { | 573 | switch(cmd) { |
| 574 | default: | 574 | default: |
| 575 | return -ENOIOCTLCMD; | 575 | return -ENOTTY; |
| 576 | 576 | ||
| 577 | case WDIOC_GETSUPPORT: | 577 | case WDIOC_GETSUPPORT: |
| 578 | if(copy_to_user(argp, &ident, sizeof(ident))) | 578 | if(copy_to_user(argp, &ident, sizeof(ident))) |