From d64a9de5efb33b21c298eb8cfc29a86374f6ac9c Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@kernel.crashing.org>
Date: Sat, 16 Apr 2005 15:24:23 -0700
Subject: [PATCH] --- yaml --- r: 37 b: refs/heads/master c:
 fd16230a05751af5a221a1f1c988bb519fd66679 h: refs/heads/master i:   35:
 9effb9b05c813f622563093050c67a6078e2084c v: v3

---
 [refs]                           |  2 +-
 trunk/arch/ppc/syslib/m8xx_wdt.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11986860bba9..6b53a0c16825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f50b153b1966230e78034d5ab1641ca4bb5db56d
+refs/heads/master: fd16230a05751af5a221a1f1c988bb519fd66679
diff --git a/trunk/arch/ppc/syslib/m8xx_wdt.c b/trunk/arch/ppc/syslib/m8xx_wdt.c
index 7838a44bfd1d..2ddc857e7fc7 100644
--- a/trunk/arch/ppc/syslib/m8xx_wdt.c
+++ b/trunk/arch/ppc/syslib/m8xx_wdt.c
@@ -11,6 +11,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <asm/8xx_immap.h>
@@ -18,6 +19,12 @@
 
 static int wdt_timeout;
 
+static irqreturn_t m8xx_wdt_interrupt(int, void *, struct pt_regs *);
+static struct irqaction m8xx_wdt_irqaction = {
+	.handler = m8xx_wdt_interrupt,
+	.name = "watchdog",
+};
+
 void m8xx_wdt_reset(void)
 {
 	volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR;
@@ -84,8 +91,8 @@ void __init m8xx_wdt_handler_install(bd_t * binfo)
 	imap->im_sit.sit_piscr =
 	    (mk_int_int_mask(PIT_INTERRUPT) << 8) | PISCR_PIE | PISCR_PTE;
 
-	if (request_irq(PIT_INTERRUPT, m8xx_wdt_interrupt, 0, "watchdog", NULL))
-		panic("m8xx_wdt: could not allocate watchdog irq!");
+	if (setup_irq(PIT_INTERRUPT, &m8xx_wdt_irqaction))
+		panic("m8xx_wdt: error setting up the watchdog irq!");
 
 	printk(KERN_NOTICE
 	       "m8xx_wdt: keep-alive trigger installed (PITC: 0x%04X)\n", pitc);