This is the device info from the chip shared memory - rename to avoid confusion
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 /****************************************************************************
  * Device Information                                                      *
  ****************************************************************************/
-struct dev_info {                                                  /* size */
+struct shm_dev_info {                                              /* size */
 
        u32    bc_rev; /* 8 bits each: major, minor, build */          /* 4 */
 
 #define SHR_MEM_VALIDITY_ACTIVE_MFW_NONE           0x000001c0
 #define SHR_MEM_VALIDITY_ACTIVE_MFW_MASK           0x000001c0
 
-       struct dev_info         dev_info;                /* 0x8     (0x438) */
+       struct shm_dev_info     dev_info;                /* 0x8     (0x438) */
 
        u8                      reserved[52*PORT_MAX];