diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/scsi/a3000.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/a3000.c')
| -rw-r--r-- | drivers/scsi/a3000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index 7bf46d40b561..1299bc8edef1 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | static struct Scsi_Host *a3000_host = NULL; | 27 | static struct Scsi_Host *a3000_host = NULL; |
| 28 | 28 | ||
| 29 | static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp) | 29 | static irqreturn_t a3000_intr (int irq, void *dummy) |
| 30 | { | 30 | { |
| 31 | unsigned long flags; | 31 | unsigned long flags; |
| 32 | unsigned int status = DMA(a3000_host)->ISTR; | 32 | unsigned int status = DMA(a3000_host)->ISTR; |