From 2fe5d5470b191f35171f2560a24d56a373131cd6 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 25 Feb 2010 14:03:17 -0600
Subject: [PATCH] --- yaml --- r: 188306 b: refs/heads/master c:
 ff9fea94546afa2a496c15354533f06088347f6e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 758ce75bec9d..d0072f0c51ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31468401ccf64322ca99fe05fbe64f1551240f57
+refs/heads/master: ff9fea94546afa2a496c15354533f06088347f6e
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 3d43bb245ac8..2e1edce9b20e 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -3174,7 +3174,7 @@ static void __devinit hpsa_interrupt_mode(struct ctlr_info *h,
 	h->intr[PERF_MODE_INT] = pdev->irq;
 }
 
-static int hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev)
+static int __devinit hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev)
 {
 	ushort subsystem_vendor_id, subsystem_device_id, command;
 	u32 board_id, scratchpad = 0;