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
/
aic7xxx_old.c
diff --git
a/drivers/scsi/aic7xxx_old.c
b/drivers/scsi/aic7xxx_old.c
index
770f164
..
ba3bcca
100644
(file)
--- a/
drivers/scsi/aic7xxx_old.c
+++ b/
drivers/scsi/aic7xxx_old.c
@@
-249,8
+249,6
@@
#include <linux/stat.h>
#include <linux/slab.h> /* for kmalloc() */
#include <linux/stat.h>
#include <linux/slab.h> /* for kmalloc() */
-#include <linux/config.h> /* for CONFIG_PCI */
-
#define AIC7XXX_C_VERSION "5.2.6"
#define ALL_TARGETS -1
#define AIC7XXX_C_VERSION "5.2.6"
#define ALL_TARGETS -1
@@
-1565,7
+1563,7
@@
aic7xxx_check_patch(struct aic7xxx_host *p,
struct sequencer_patch *last_patch;
int num_patches;
struct sequencer_patch *last_patch;
int num_patches;
- num_patches =
sizeof(sequencer_patches)/sizeof(struct sequencer_patch
);
+ num_patches =
ARRAY_SIZE(sequencer_patches
);
last_patch = &sequencer_patches[num_patches];
cur_patch = *start_patch;
last_patch = &sequencer_patches[num_patches];
cur_patch = *start_patch;
@@
-8322,11
+8320,11
@@
aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
}
else
{
}
else
{
- result = (request_irq(p->irq, do_aic7xxx_isr,
SA_SHIRQ
,
+ result = (request_irq(p->irq, do_aic7xxx_isr,
IRQF_SHARED
,
"aic7xxx", p));
if (result < 0)
{
"aic7xxx", p));
if (result < 0)
{
- result = (request_irq(p->irq, do_aic7xxx_isr,
SA_INTERRUPT | SA_SHIRQ
,
+ result = (request_irq(p->irq, do_aic7xxx_isr,
IRQF_DISABLED | IRQF_SHARED
,
"aic7xxx", p));
}
}
"aic7xxx", p));
}
}