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 branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[pandora-kernel.git]
/
drivers
/
scsi
/
wd7000.c
diff --git
a/drivers/scsi/wd7000.c
b/drivers/scsi/wd7000.c
index
e55f0ee
..
a0b61af
100644
(file)
--- a/
drivers/scsi/wd7000.c
+++ b/
drivers/scsi/wd7000.c
@@
-1250,7
+1250,7
@@
static int wd7000_init(Adapter * host)
return 0;
return 0;
- if (request_irq(host->irq, wd7000_intr,
SA_INTERRUPT
, "wd7000", host)) {
+ if (request_irq(host->irq, wd7000_intr,
IRQF_DISABLED
, "wd7000", host)) {
printk("wd7000_init: can't get IRQ %d.\n", host->irq);
return (0);
}
printk("wd7000_init: can't get IRQ %d.\n", host->irq);
return (0);
}
@@
-1391,7
+1391,7
@@
static int wd7000_proc_info(struct Scsi_Host *host, char *buffer, char **start,
*
*/
*
*/
-static int wd7000_detect(struct scsi_host_template *tpnt)
+static
__init
int wd7000_detect(struct scsi_host_template *tpnt)
{
short present = 0, biosaddr_ptr, sig_ptr, i, pass;
short biosptr[NUM_CONFIGS];
{
short present = 0, biosaddr_ptr, sig_ptr, i, pass;
short biosptr[NUM_CONFIGS];