From 2e085dd08a58208883be7d509faafc65b7c39262 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Mon, 28 Nov 2011 20:12:05 +0100
Subject: [PATCH] --- yaml --- r: 276687 b: refs/heads/master c:
 6225da481597ebff09454c785fe0afc7f5fdbb77 h: refs/heads/master i:   276685:
 992a3c52a8a70042cb7df6fdf2b14c9636f46305   276683:
 5e0d03e4b00b373de49dfd4cce3a4206c4d46b6f   276679:
 91afcaf92f5718cb053c98a7e134ce7a7e3e5718   276671:
 3d04eb3a53174e7b95724f29d91b23aa4ec117f6 v: v3

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

diff --git a/[refs] b/[refs]
index 28d10487ee5c..c5089b12363c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae95757a9065d89be7c1ca613b53163dd30858b7
+refs/heads/master: 6225da481597ebff09454c785fe0afc7f5fdbb77
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 8004ac30a7a8..6f22ed0dab65 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4880,7 +4880,7 @@ static int cciss_request_irq(ctlr_info_t *h,
 {
 	if (h->msix_vector || h->msi_vector) {
 		if (!request_irq(h->intr[h->intr_mode], msixhandler,
-				IRQF_DISABLED, h->devname, h))
+				0, h->devname, h))
 			return 0;
 		dev_err(&h->pdev->dev, "Unable to get msi irq %d"
 			" for %s\n", h->intr[h->intr_mode],
@@ -4889,7 +4889,7 @@ static int cciss_request_irq(ctlr_info_t *h,
 	}
 
 	if (!request_irq(h->intr[h->intr_mode], intxhandler,
-			IRQF_DISABLED, h->devname, h))
+			IRQF_SHARED, h->devname, h))
 		return 0;
 	dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n",
 		h->intr[h->intr_mode], h->devname);