From 22cbbbc88ea3f6ff358e08ff298350e065626aa2 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 29 Jun 2006 14:39:11 -0700
Subject: [PATCH] --- yaml --- r: 31304 b: refs/heads/master c:
 00cde6748255a84beecfdea4caeaf7c9cd05a527 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/power.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85f1af915f07..f46c457414c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d44b3be88ed58bb1bbbf7d70c533598b3dc3d870
+refs/heads/master: 00cde6748255a84beecfdea4caeaf7c9cd05a527
diff --git a/trunk/arch/sparc64/kernel/power.c b/trunk/arch/sparc64/kernel/power.c
index 9496c7734014..df0a82d082b3 100644
--- a/trunk/arch/sparc64/kernel/power.c
+++ b/trunk/arch/sparc64/kernel/power.c
@@ -131,7 +131,7 @@ static void __devinit power_probe_common(struct of_device *dev, struct resource
 		printk("powerd running.\n");
 
 		if (request_irq(irq,
-				power_handler, SA_SHIRQ, "power", NULL) < 0)
+				power_handler, 0, "power", NULL) < 0)
 			printk("power: Error, cannot register IRQ handler.\n");
 	} else {
 		printk("not using powerd.\n");