diff --git a/[refs] b/[refs] index 49f8709f29ed..9d051f8ed115 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe8bce7b3b69835e8049106947db6b0f1f3a8d8 +refs/heads/master: 4f5157307652f1cbff2413b5e81ebcadd8e2524b diff --git a/trunk/drivers/net/bnx2x/bnx2x.h b/trunk/drivers/net/bnx2x/bnx2x.h index 6fc77a4a5de6..c49b643e009b 100644 --- a/trunk/drivers/net/bnx2x/bnx2x.h +++ b/trunk/drivers/net/bnx2x/bnx2x.h @@ -20,8 +20,8 @@ * (you will need to reboot afterwards) */ /* #define BNX2X_STOP_ON_ERROR */ -#define DRV_MODULE_VERSION "1.52.53-7" -#define DRV_MODULE_RELDATE "2010/09/12" +#define DRV_MODULE_VERSION "1.60.00-1" +#define DRV_MODULE_RELDATE "2010/10/06" #define BNX2X_BC_VER 0x040200 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)