diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2011-06-14 05:34:02 +0400 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 18:56:56 +0400 |
| commit | 754a2f5220ac7d597454df3104cfce9c83d68df0 (patch) | |
| tree | d00abd015be81f74128fa1f96a3de29e6332b7db /drivers/net/bnx2x/bnx2x.h | |
| parent | ef01854e24035a0b17ebeb98b05cfee2c8b36e02 (diff) | |
| download | linux-754a2f5220ac7d597454df3104cfce9c83d68df0.tar.xz | |
bnx2x: Cosmetic changes.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index c108e4cf6333..838a4edbe942 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -26,10 +26,6 @@ #define DRV_MODULE_RELDATE "2011/03/20" #define BNX2X_BC_VER 0x040200 -#define BNX2X_MULTI_QUEUE - -#define BNX2X_NEW_NAPI - #if defined(CONFIG_DCB) #define BCM_DCBNL #endif @@ -745,9 +741,9 @@ struct bnx2x_common { (CHIP_REV(bp) == CHIP_REV_Ax)) int flash_size; -#define NVRAM_1MB_SIZE 0x20000 /* 1M bit in bytes */ -#define NVRAM_TIMEOUT_COUNT 30000 -#define NVRAM_PAGE_SIZE 256 +#define BNX2X_NVRAM_1MB_SIZE 0x20000 /* 1M bit in bytes */ +#define BNX2X_NVRAM_TIMEOUT_COUNT 30000 +#define BNX2X_NVRAM_PAGE_SIZE 256 u32 shmem_base; u32 shmem2_base; |