diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 00:29:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 00:29:38 -0500 |
| commit | 3474cbd11df8cdd6413781ea95bd51dd469098ff (patch) | |
| tree | c8d78f415c00bad503541bee6dd68055997c3ad7 /drivers/scsi | |
| parent | d89b218b801fd93ea95880f1c7fde348cbcc51c5 (diff) | |
| parent | 2d378b9179881b46a0faf11430efb421fe03ddd8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add very basic XVR-1000 framebuffer driver.
qlogicpti: Remove slash in QlogicPTI irq name
Diffstat (limited to 'drivers/scsi')
| -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); |