From: Eilon Greenstein Date: Thu, 12 Feb 2009 08:38:11 +0000 (+0000) Subject: bnx2x: Better struct naming X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5cd65a93e9335393d5e1f18d35d337b7ba1280f8;p=linux-2.6-omap-h63xx.git bnx2x: Better struct naming This is the device info from the chip shared memory - rename to avoid confusion Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller --- diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index 8452605d058..88b2aa3180e 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h @@ -488,7 +488,7 @@ struct port_feat_cfg { /* port 0: 0x454 port 1: 0x4c8 */ /**************************************************************************** * Device Information * ****************************************************************************/ -struct dev_info { /* size */ +struct shm_dev_info { /* size */ u32 bc_rev; /* 8 bits each: major, minor, build */ /* 4 */ @@ -841,7 +841,7 @@ struct shmem_region { /* SharedMem Offset (size) */ #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];