diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 18:02:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-10 18:02:16 -0700 |
| commit | dae311b42fcad5d236dc6539b02c7560fc6fc721 (patch) | |
| tree | 88dd1bba6ea8f6be81baecaf69ad3a0aa70345f8 /drivers/watchdog/mtx-1_wdt.c | |
| parent | 99eeed47a1ee26fbce49c878788a6882bf90d8f2 (diff) | |
| parent | 8b1266f43d2671cbfc240bfd38fc77c6db02de54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static
[WATCHDOG] Remove volatiles from watchdog device structures
[WATCHDOG] replace remaining __FUNCTION__ occurrences
[WATCHDOG] hpwdt: Use dmi_walk() instead of own copy
[WATCHDOG] Fix return value warning in hpwdt
[WATCHDOG] Fix declaration of struct smbios_entry_point in hpwdt
[WATCHDOG] it8712f_wdt support for 16-bit timeout values, WDIOC_GETSTATUS
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
| -rw-r--r-- | drivers/watchdog/mtx-1_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 789831b3fa0..10b89f2703b 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c @@ -59,9 +59,9 @@ static int ticks = 100 * HZ; static struct { struct completion stop; - volatile int running; + int running; struct timer_list timer; - volatile int queue; + int queue; int default_ticks; unsigned long inuse; unsigned gpio; |