From 29b7c04f98cc1bfd9db1529c9de41d85271146d1 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Mon, 28 Nov 2011 10:15:20 -0600
Subject: [PATCH] --- yaml --- r: 282247 b: refs/heads/master c:
 45bcf018d1a4779d592764ef57517c92589d55d7 h: refs/heads/master i:   282245:
 39f0198613790de9b85eb12de0a23975578b35b1   282243:
 44024f10a33a6214e40d0415b53140aa80cd9d4e   282239:
 baf507b492c533d97b2a4d57220ad1c37fc8d287 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 848508c76e31..1ff60e3ada05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85d37226fb5faaf7bec55df50c2cd029bd6bb3cd
+refs/heads/master: 45bcf018d1a4779d592764ef57517c92589d55d7
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 865d452542be..594ce8316727 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -4072,10 +4072,10 @@ static int hpsa_request_irq(struct ctlr_info *h,
 
 	if (h->msix_vector || h->msi_vector)
 		rc = request_irq(h->intr[h->intr_mode], msixhandler,
-				IRQF_DISABLED, h->devname, h);
+				0, h->devname, h);
 	else
 		rc = request_irq(h->intr[h->intr_mode], intxhandler,
-				IRQF_DISABLED, h->devname, h);
+				IRQF_SHARED, h->devname, h);
 	if (rc) {
 		dev_err(&h->pdev->dev, "unable to get irq %d for %s\n",
 		       h->intr[h->intr_mode], h->devname);