Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()

...

This commit is contained in:

Linus Torvalds 2006-10-03 14:32:06 -07:00

parent 2fee7b1845 f311896a99

commit f3c87a8999

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/char/watchdog/iTCO_wdt.c

View file

2

drivers/char/watchdog/pnx4008_wdt.c

View file