diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 18:20:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 18:20:32 -0700 |
| commit | 12145387a042e8aa4439485f8976e6992a529b12 (patch) | |
| tree | ae161089e3058663510033fa85ed05115ab3b550 /drivers/net/bnx2.h | |
| parent | [MIPS] Fix oprofile logic to physical counter remapping (diff) | |
| parent | [BNX2]: Fix occasional NETDEV WATCHDOG on 5709. (diff) | |
| download | linux-dev-12145387a042e8aa4439485f8976e6992a529b12.tar.xz linux-dev-12145387a042e8aa4439485f8976e6992a529b12.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
[IPV6]: Disallow RH0 by default.
[XFRM]: beet: fix pseudo header length value
[TCP]: Congestion control initialization.
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index ccbdf81c6599..878eee58f12a 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6518,6 +6518,7 @@ struct bnx2 { #define CHIP_ID_5708_B0 0x57081000 #define CHIP_ID_5708_B1 0x57081010 #define CHIP_ID_5709_A0 0x57090000 +#define CHIP_ID_5709_A1 0x57090010 #define CHIP_BOND_ID(bp) (((bp)->chip_id) & 0xf) |