Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index fa34b92850a6..aa406497eebc 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/slab.h>
+#include <linux/gfp.h>
 #include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
@@ -738,7 +738,7 @@ static int __devinit qpti_register_irq(struct qlogicpti *qpti)
          * sanely maintain.
          */
         if (request_irq(qpti->irq, qpti_intr,
-                        IRQF_SHARED, "Qlogic/PTI", qpti))
+                        IRQF_SHARED, "QlogicPTI", qpti))
                 goto fail;
 
         printk("qlogicpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);