diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/char/ipmi/ipmi_watchdog.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/ipmi/ipmi_watchdog.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index accaaf1a6b69..73f759eaa5a6 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
| @@ -903,7 +903,7 @@ static void ipmi_register_watchdog(int ipmi_intf) | |||
| 903 | 903 | ||
| 904 | #ifdef HAVE_NMI_HANDLER | 904 | #ifdef HAVE_NMI_HANDLER |
| 905 | static int | 905 | static int |
| 906 | ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled) | 906 | ipmi_nmi(void *dev_id, int cpu, int handled) |
| 907 | { | 907 | { |
| 908 | /* If we are not expecting a timeout, ignore it. */ | 908 | /* If we are not expecting a timeout, ignore it. */ |
| 909 | if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE) | 909 | if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE) |