Merge tag 'v5.1-rc1' into spi-5.2

[linux-2.6-microblaze.git] / drivers / scsi / qlogicpti.h

diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index 884ad72..2b6374e 100644 (file)
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -364,7 +364,6 @@ struct qlogicpti {
        int                       qpti_id;
        int                       scsi_id;
        int                       prom_node;
-       char                      prom_name[64];
        int                       irq;
        char                      differential, ultra, clock;
        unsigned char             bursts;
@@ -379,7 +378,7 @@ struct qlogicpti {
 #define SREG_IMASK                0x0c   /* Interrupt level            */
 #define SREG_SPMASK               0x03   /* Mask for switch pack       */
        unsigned char             swsreg;
-       unsigned int    
+       unsigned int
                gotirq  :       1,      /* this instance got an irq */
                is_pti  :       1;      /* Non-zero if this is a PTI board. */
 };