projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
pas16.c
diff --git
a/drivers/scsi/pas16.c
b/drivers/scsi/pas16.c
index 1bf96ed8f935ac86b21ae0a0e21ee556e7d42395..ee59656599714e25bf47cdd2eb1ed875e252fa54 100644
(file)
--- a/
drivers/scsi/pas16.c
+++ b/
drivers/scsi/pas16.c
@@
-116,7
+116,6
@@
#include <asm/system.h>
#include <linux/signal.h>
#include <linux/proc_fs.h>
#include <asm/system.h>
#include <linux/signal.h>
#include <linux/proc_fs.h>
-#include <linux/sched.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/blkdev.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/blkdev.h>
@@
-454,7
+453,7
@@
int __init pas16_detect(struct scsi_host_template * tpnt)
instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
if (instance->irq != SCSI_IRQ_NONE)
instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
if (instance->irq != SCSI_IRQ_NONE)
- if (request_irq(instance->irq, pas16_intr,
SA_INTERRUPT
, "pas16", instance)) {
+ if (request_irq(instance->irq, pas16_intr,
IRQF_DISABLED
, "pas16", instance)) {
printk("scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE;
printk("scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE;