diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/char/watchdog/wdt285.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/watchdog/wdt285.c')
| -rw-r--r-- | drivers/char/watchdog/wdt285.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdt285.c b/drivers/char/watchdog/wdt285.c index 89a249e23fde..e4cf661dc890 100644 --- a/drivers/char/watchdog/wdt285.c +++ b/drivers/char/watchdog/wdt285.c | |||
| @@ -46,7 +46,7 @@ static unsigned long timer_alive; | |||
| 46 | /* | 46 | /* |
| 47 | * If the timer expires.. | 47 | * If the timer expires.. |
| 48 | */ | 48 | */ |
| 49 | static void watchdog_fire(int irq, void *dev_id, struct pt_regs *regs) | 49 | static void watchdog_fire(int irq, void *dev_id) |
| 50 | { | 50 | { |
| 51 | printk(KERN_CRIT "Watchdog: Would Reboot.\n"); | 51 | printk(KERN_CRIT "Watchdog: Would Reboot.\n"); |
| 52 | *CSR_TIMER4_CNTL = 0; | 52 | *CSR_TIMER4_CNTL = 0; |