diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/syslib/m8xx_wdt.c | |
parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/syslib/m8xx_wdt.c')
-rw-r--r-- | arch/ppc/syslib/m8xx_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/m8xx_wdt.c b/arch/ppc/syslib/m8xx_wdt.c index ac11d7bab443..fffac8cbeb51 100644 --- a/arch/ppc/syslib/m8xx_wdt.c +++ b/arch/ppc/syslib/m8xx_wdt.c | |||
@@ -21,7 +21,7 @@ | |||
21 | static int wdt_timeout; | 21 | static int wdt_timeout; |
22 | int m8xx_has_internal_rtc = 0; | 22 | int m8xx_has_internal_rtc = 0; |
23 | 23 | ||
24 | static irqreturn_t m8xx_wdt_interrupt(int, void *, struct pt_regs *); | 24 | static irqreturn_t m8xx_wdt_interrupt(int, void *); |
25 | static struct irqaction m8xx_wdt_irqaction = { | 25 | static struct irqaction m8xx_wdt_irqaction = { |
26 | .handler = m8xx_wdt_interrupt, | 26 | .handler = m8xx_wdt_interrupt, |
27 | .name = "watchdog", | 27 | .name = "watchdog", |
@@ -35,7 +35,7 @@ void m8xx_wdt_reset(void) | |||
35 | out_be16(&imap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */ | 35 | out_be16(&imap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */ |
36 | } | 36 | } |
37 | 37 | ||
38 | static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev, struct pt_regs *regs) | 38 | static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev) |
39 | { | 39 | { |
40 | volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR; | 40 | volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR; |
41 | 41 | ||