git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
scsi
/
fd_mcs.c
diff --git
a/drivers/scsi/fd_mcs.c
b/drivers/scsi/fd_mcs.c
index
cca485a
..
dde3edf
100644
(file)
--- a/
drivers/scsi/fd_mcs.c
+++ b/
drivers/scsi/fd_mcs.c
@@
-279,7
+279,7
@@
static struct fd_mcs_adapters_struct fd_mcs_adapters[] = {
2},
};
2},
};
-#define FD_BRDS
sizeof(fd_mcs_adapters)/sizeof(struct fd_mcs_adapters_struct
)
+#define FD_BRDS
ARRAY_SIZE(fd_mcs_adapters
)
static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs);
static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs);
@@
-400,7
+400,7
@@
static int fd_mcs_detect(struct scsi_host_template * tpnt)
mca_set_adapter_name(slot - 1, fd_mcs_adapters[loop].name);
/* check irq/region */
mca_set_adapter_name(slot - 1, fd_mcs_adapters[loop].name);
/* check irq/region */
- if (request_irq(irq, fd_mcs_intr,
SA_SHIRQ
, "fd_mcs", hosts)) {
+ if (request_irq(irq, fd_mcs_intr,
IRQF_SHARED
, "fd_mcs", hosts)) {
printk(KERN_ERR "fd_mcs: interrupt is not available, skipping...\n");
continue;
}
printk(KERN_ERR "fd_mcs: interrupt is not available, skipping...\n");
continue;
}