diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |
parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 8b163388659a..5c27454d2ec2 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -431,6 +431,9 @@ void bnx2x_panic_dump(struct bnx2x *bp); | |||
431 | 431 | ||
432 | void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl); | 432 | void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl); |
433 | 433 | ||
434 | /* validate currect fw is loaded */ | ||
435 | bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err); | ||
436 | |||
434 | /* dev_close main block */ | 437 | /* dev_close main block */ |
435 | int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode); | 438 | int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode); |
436 | 439 | ||