diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test1/drivers/scsi/sym53c8xx.c linux-2.6.0-test1-ac2/drivers/scsi/sym53c8xx.c
--- linux-2.6.0-test1/drivers/scsi/sym53c8xx.c 2003-07-10 21:12:16.000000000 +0100
+++ linux-2.6.0-test1-ac2/drivers/scsi/sym53c8xx.c 2003-07-15 18:01:30.000000000 +0100
@@ -1327,7 +1327,7 @@
#define SetScsiAbortResult(cmd) SetScsiResult(cmd, DID_ABORT, 0xff)
#endif
-static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs);
+static irqreturn_t sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs);
static void sym53c8xx_timeout(unsigned long np);
#define initverbose (driver_setup.verbose)
@@ -7374,7 +7374,7 @@
}
if (cp->xerr_status & XE_BAD_PHASE) {
PRINT_ADDR(cmd);
- printk ("illegal scsi phase (4/5).\n");
+ printk ("invalid scsi phase (4/5).\n");
}
if (cp->xerr_status & XE_SODL_UNRUN) {
PRINT_ADDR(cmd);
@@ -13660,7 +13660,7 @@
** routine for each host that uses this IRQ.
*/
-static void sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t sym53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
{
unsigned long flags;
ncb_p np = (ncb_p) dev_id;
@@ -13685,6 +13685,7 @@
ncr_flush_done_cmds(done_list);
NCR_UNLOCK_SCSI_DONE(done_list->device->host, flags);
}
+ return IRQ_HANDLED;
}
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:34 EST