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/qlogicpti.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/qlogicpti.c')
| -rw-r--r-- | drivers/scsi/qlogicpti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 5b2f0741a55b..ed58bb489889 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c | |||
| @@ -649,7 +649,7 @@ static int qlogicpti_verify_tmon(struct qlogicpti *qpti) | |||
| 649 | return 0; | 649 | return 0; |
| 650 | } | 650 | } |
| 651 | 651 | ||
| 652 | static irqreturn_t qpti_intr(int irq, void *dev_id, struct pt_regs *regs); | 652 | static irqreturn_t qpti_intr(int irq, void *dev_id); |
| 653 | 653 | ||
| 654 | static void __init qpti_chain_add(struct qlogicpti *qpti) | 654 | static void __init qpti_chain_add(struct qlogicpti *qpti) |
| 655 | { | 655 | { |
| @@ -1297,7 +1297,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) | |||
| 1297 | return done_queue; | 1297 | return done_queue; |
| 1298 | } | 1298 | } |
| 1299 | 1299 | ||
| 1300 | static irqreturn_t qpti_intr(int irq, void *dev_id, struct pt_regs *regs) | 1300 | static irqreturn_t qpti_intr(int irq, void *dev_id) |
| 1301 | { | 1301 | { |
| 1302 | struct qlogicpti *qpti = dev_id; | 1302 | struct qlogicpti *qpti = dev_id; |
| 1303 | unsigned long flags; | 1303 | unsigned long flags; |