From eedee3b74b3862c682a2aaa62410a74dee9a32a5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 12 Sep 2008 15:13:15 -0700
Subject: [PATCH] --- yaml --- r: 109807 b: refs/heads/master c:
 80a56ab626c70468be92e74cf3d288ffaed23fdb h: refs/heads/master i:   109805:
 09e6e5de6fb462dcde0bae36831a47d80ae62dac   109803:
 25ccea4f7ff894049ded2bef30759668e1ee32ff   109799:
 a7a8ba39ba7dc2e42784154d4e97ab2a53845203   109791:
 e404cc21774677bdf9d82491b513d21175da8293 v: v3

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

diff --git a/[refs] b/[refs]
index 25b9023207a3..a4082d21fda0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdba4d6b77fcc76f206986d7cc55f1feb20301f8
+refs/heads/master: 80a56ab626c70468be92e74cf3d288ffaed23fdb
diff --git a/trunk/arch/sparc64/kernel/pci_psycho.c b/trunk/arch/sparc64/kernel/pci_psycho.c
index ef5fe29202c2..e205ade69cfc 100644
--- a/trunk/arch/sparc64/kernel/pci_psycho.c
+++ b/trunk/arch/sparc64/kernel/pci_psycho.c
@@ -744,16 +744,16 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
 	 * the second will just error out since we do not pass in
 	 * IRQF_SHARED.
 	 */
-	err = request_irq(op->irqs[1], psycho_ue_intr, 0,
+	err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
 			  "PSYCHO_UE", pbm);
-	err = request_irq(op->irqs[2], psycho_ce_intr, 0,
+	err = request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED,
 			  "PSYCHO_CE", pbm);
 
 	/* This one, however, ought not to fail.  We can just warn
 	 * about it since the system can still operate properly even
 	 * if this fails.
 	 */
-	err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
+	err = request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,
 			  "PSYCHO_PCIERR", pbm);
 	if (err)
 		printk(KERN_WARNING "%s: Could not register PCIERR, "