aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptbase.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r--drivers/message/fusion/mptbase.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 20609966c2a9..43308df64623 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -46,7 +46,6 @@
46*/ 46*/
47/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ 47/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
48 48
49#include <linux/config.h>
50#include <linux/kernel.h> 49#include <linux/kernel.h>
51#include <linux/module.h> 50#include <linux/module.h>
52#include <linux/errno.h> 51#include <linux/errno.h>
@@ -1696,7 +1695,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
1696 printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", 1695 printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n",
1697 ioc->name); 1696 ioc->name);
1698 rc = request_irq(ioc->pcidev->irq, mpt_interrupt, 1697 rc = request_irq(ioc->pcidev->irq, mpt_interrupt,
1699 SA_SHIRQ, ioc->name, ioc); 1698 IRQF_SHARED, ioc->name, ioc);
1700 if (rc < 0) { 1699 if (rc < 0) {
1701 printk(MYIOC_s_ERR_FMT "Unable to allocate " 1700 printk(MYIOC_s_ERR_FMT "Unable to allocate "
1702 "interrupt %d!\n", ioc->name, 1701 "interrupt %d!\n", ioc->name,
@@ -5613,7 +5612,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
5613 5612
5614 /* The SCSI driver needs to adjust timeouts on all current 5613 /* The SCSI driver needs to adjust timeouts on all current
5615 * commands prior to the diagnostic reset being issued. 5614 * commands prior to the diagnostic reset being issued.
5616 * Prevents timeouts occuring during a diagnostic reset...very bad. 5615 * Prevents timeouts occurring during a diagnostic reset...very bad.
5617 * For all other protocol drivers, this is a no-op. 5616 * For all other protocol drivers, this is a no-op.
5618 */ 5617 */
5619 { 5618 {