diff --git a/[refs] b/[refs] index 2bab702faed9..83fe59d28529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e1d0de95c55383f598516ebf82969260c18e4bd +refs/heads/master: 1f2435e532bd64742c3f766b7d5c17cc9d0b8558 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 6ba2fecd89fc..1a2780374a49 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -57,8 +57,8 @@ #define DRV_MODULE_NAME "bnx2" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.8.2" -#define DRV_MODULE_RELDATE "Nov 10, 2008" +#define DRV_MODULE_VERSION "1.9.0" +#define DRV_MODULE_RELDATE "Dec 16, 2008" #define RUN_AT(x) (jiffies + (x)) @@ -131,7 +131,7 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = { { PCI_VENDOR_ID_BROADCOM, 0x163b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, { PCI_VENDOR_ID_BROADCOM, 0x163c, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716S }, { 0, } };