Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / scsi / qla4xxx / ql4_nvram.h

diff --git a/drivers/scsi/qla4xxx/ql4_nvram.h b/drivers/scsi/qla4xxx/ql4_nvram.h
index 08e2aed8c6cc20bdec0eea8fc219e5824081a40e..b47b4fc59d834e1492adf5642b005764cb9f95fc 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_nvram.h
+++ b/drivers/scsi/qla4xxx/ql4_nvram.h
@@ -134,9 +134,7 @@ struct eeprom_data {
                        u16 phyConfig;  /* x36 */
 #define         PHY_CONFIG_PHY_ADDR_MASK             0x1f
 #define         PHY_CONFIG_ENABLE_FW_MANAGEMENT_MASK 0x20
-                       u16 topcat;     /* x38 */
-#define TOPCAT_PRESENT         0x0100
-#define TOPCAT_MASK            0xFF00
+                       u16 reserved_56;        /* x38 */
 
 #define EEPROM_UNUSED_1_SIZE   2
                        u8 unused_1[EEPROM_UNUSED_1_SIZE]; /* x3A */