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/ibmmca.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 2be1dc5d852a..0e57fb6964d5 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -497,8 +497,7 @@ static int option_setup(char *); | |||
| 497 | static int ldn_access_load(int, int); | 497 | static int ldn_access_load(int, int); |
| 498 | static int ldn_access_total_read_write(int); | 498 | static int ldn_access_total_read_write(int); |
| 499 | 499 | ||
| 500 | static irqreturn_t interrupt_handler(int irq, void *dev_id, | 500 | static irqreturn_t interrupt_handler(int irq, void *dev_id) |
| 501 | struct pt_regs *regs) | ||
| 502 | { | 501 | { |
| 503 | int host_index, ihost_index; | 502 | int host_index, ihost_index; |
| 504 | unsigned int intr_reg; | 503 | unsigned int intr_reg; |