From 7bc4eca8215c47412d8560fa1c12c0837046beae Mon Sep 17 00:00:00 2001 From: Thomas Koeller Date: Wed, 6 Dec 2006 01:45:39 +0100 Subject: [PATCH] --- yaml --- r: 44365 b: refs/heads/master c: 74e86ab884fb491c208905bdc32a9d95740be583 h: refs/heads/master i: 44363: ffe57c50f267902ce2df8c205ecdf3c94428e884 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/rm9k_wdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 474fbdbe040c..0241e7cb8598 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bec4f749cb75d30cebf9837985a06474f595f3ae +refs/heads/master: 74e86ab884fb491c208905bdc32a9d95740be583 diff --git a/trunk/drivers/char/watchdog/rm9k_wdt.c b/trunk/drivers/char/watchdog/rm9k_wdt.c index bc7def48e0e6..7576a13e86bc 100644 --- a/trunk/drivers/char/watchdog/rm9k_wdt.c +++ b/trunk/drivers/char/watchdog/rm9k_wdt.c @@ -47,7 +47,7 @@ /* Function prototypes */ -static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *); +static irqreturn_t wdt_gpi_irqhdl(int, void *); static void wdt_gpi_start(void); static void wdt_gpi_stop(void); static void wdt_gpi_set_timeout(unsigned int); @@ -115,7 +115,7 @@ static struct notifier_block wdt_gpi_shutdown = { /* Interrupt handler */ -static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs) +static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt) { if (!unlikely(__raw_readl(wd_regs + 0x0008) & 0x1)) return IRQ_NONE;