From 818f2039455dcb41268a6af480c68ccb6b7068ef Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Thu, 13 Oct 2011 11:44:06 -0500
Subject: [PATCH] --- yaml --- r: 271142 b: refs/heads/master c:
 fba63097b8614a4a158226c02eec0318f41cd24f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c2e44da92c73..6a7ce7846b7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d63673b4d469cf2ddba309a916090b54e31cc35
+refs/heads/master: fba63097b8614a4a158226c02eec0318f41cd24f
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index b200b736b000..9825ecf34957 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -3438,10 +3438,8 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
 	} else {
 		use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
 		if (use_doorbell) {
-			dev_warn(&pdev->dev, "Controller claims that "
-				"'Bit 2 doorbell reset' is "
-				"supported, but not 'bit 5 doorbell reset'.  "
-				"Firmware update is recommended.\n");
+			dev_warn(&pdev->dev, "Soft reset not supported. "
+				"Firmware update is required.\n");
 			rc = -ENOTSUPP; /* try soft reset */
 			goto unmap_cfgtable;
 		}