From 24ce68a8220cc70483667563c3a4e0156e68b55f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Mar 2009 17:08:52 +0000
Subject: [PATCH] --- yaml --- r: 138569 b: refs/heads/master c:
 fb2474491cd3925e6ecece0823f4673af3b0d597 h: refs/heads/master i:   138567:
 9f8ba220e9db2848e62cb26eea0f377799e2af91 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/sysdev/pmi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a302b0d87425..1a0abea66519 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56aa4129e87be43676c6e3eac41a6aa553877802
+refs/heads/master: fb2474491cd3925e6ecece0823f4673af3b0d597
diff --git a/trunk/arch/powerpc/sysdev/pmi.c b/trunk/arch/powerpc/sysdev/pmi.c
index c858749263e0..aaa915998eb6 100644
--- a/trunk/arch/powerpc/sysdev/pmi.c
+++ b/trunk/arch/powerpc/sysdev/pmi.c
@@ -50,7 +50,7 @@ struct pmi_data {
 
 static struct pmi_data *data;
 
-static int pmi_irq_handler(int irq, void *dev_id)
+static irqreturn_t pmi_irq_handler(int irq, void *dev_id)
 {
 	u8 type;
 	int rc;