diff options
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 12dd8d493ee2..57543603d6c8 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> |
@@ -1706,7 +1705,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) | |||
1706 | printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", | 1705 | printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", |
1707 | ioc->name); | 1706 | ioc->name); |
1708 | rc = request_irq(ioc->pcidev->irq, mpt_interrupt, | 1707 | rc = request_irq(ioc->pcidev->irq, mpt_interrupt, |
1709 | SA_SHIRQ, ioc->name, ioc); | 1708 | IRQF_SHARED, ioc->name, ioc); |
1710 | if (rc < 0) { | 1709 | if (rc < 0) { |
1711 | printk(MYIOC_s_ERR_FMT "Unable to allocate " | 1710 | printk(MYIOC_s_ERR_FMT "Unable to allocate " |
1712 | "interrupt %d!\n", ioc->name, | 1711 | "interrupt %d!\n", ioc->name, |
@@ -5592,7 +5591,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag) | |||
5592 | 5591 | ||
5593 | /* The SCSI driver needs to adjust timeouts on all current | 5592 | /* The SCSI driver needs to adjust timeouts on all current |
5594 | * commands prior to the diagnostic reset being issued. | 5593 | * commands prior to the diagnostic reset being issued. |
5595 | * Prevents timeouts occuring during a diagnostic reset...very bad. | 5594 | * Prevents timeouts occurring during a diagnostic reset...very bad. |
5596 | * For all other protocol drivers, this is a no-op. | 5595 | * For all other protocol drivers, this is a no-op. |
5597 | */ | 5596 | */ |
5598 | { | 5597 | { |