git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
drivers
/
scsi
/
ipr.c
diff --git
a/drivers/scsi/ipr.c
b/drivers/scsi/ipr.c
index
96b65b3
..
01080b3
100644
(file)
--- a/
drivers/scsi/ipr.c
+++ b/
drivers/scsi/ipr.c
@@
-54,7
+54,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/types.h>
@@
-6429,7
+6428,7
@@
static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
ioa_cfg->needs_hard_reset = 1;
ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
ioa_cfg->needs_hard_reset = 1;
ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
- rc = request_irq(pdev->irq, ipr_isr,
SA_SHIRQ
, IPR_NAME, ioa_cfg);
+ rc = request_irq(pdev->irq, ipr_isr,
IRQF_SHARED
, IPR_NAME, ioa_cfg);
if (rc) {
dev_err(&pdev->dev, "Couldn't register IRQ %d! rc=%d\n",
if (rc) {
dev_err(&pdev->dev, "Couldn't register IRQ %d! rc=%d\n",