Merge branches 'x86-rwsem-for-linus' and 'x86-gcc46-for-linus' of git://git.kernel...

[sfrench/cifs-2.6.git] / drivers / scsi / hpsa.h

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 1bb5233b09a0e5eb7ee5365488da09ada6252630..a203ef65cb504e1d03b023e9500b239a0ea09db9 100644 (file)
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -53,7 +53,6 @@ struct ctlr_info {
        int     ctlr;
        char    devname[8];
        char    *product_name;
-       char    firm_ver[4]; /* Firmware version */
        struct pci_dev *pdev;
        u32     board_id;
        void __iomem *vaddr;