diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /drivers/scsi/qlogicpti.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'drivers/scsi/qlogicpti.c')
| -rw-r--r-- | drivers/scsi/qlogicpti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index fa34b92850a6..1b8217076b0e 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c | |||
| @@ -738,7 +738,7 @@ static int __devinit qpti_register_irq(struct qlogicpti *qpti) | |||
| 738 | * sanely maintain. | 738 | * sanely maintain. |
| 739 | */ | 739 | */ |
| 740 | if (request_irq(qpti->irq, qpti_intr, | 740 | if (request_irq(qpti->irq, qpti_intr, |
| 741 | IRQF_SHARED, "Qlogic/PTI", qpti)) | 741 | IRQF_SHARED, "QlogicPTI", qpti)) |
| 742 | goto fail; | 742 | goto fail; |
| 743 | 743 | ||
| 744 | printk("qlogicpti%d: IRQ %d ", qpti->qpti_id, qpti->irq); | 744 | printk("qlogicpti%d: IRQ %d ", qpti->qpti_id, qpti->irq); |