From 9264dd8ac99d5afefc075fed0cf0abe67e39f7e4 Mon Sep 17 00:00:00 2001
From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Wed, 23 Jan 2013 03:21:53 +0000
Subject: [PATCH] --- yaml --- r: 351595 b: refs/heads/master c:
 ca9bdb9b279d3bffb7f8a0dc15686a2c23fa0c12 h: refs/heads/master i:   351593:
 cff44dfbca1bb866bef82649360d2d7f44d87b2a   351591:
 a3c61c0ab2233293d1ebdf254ce29f65e3364fe4 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h     | 2 ++
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c195fd82175..e9dcf0ac74b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad9b4359c7839d4d87aad2c0d50c8a2ef3bcddb3
+refs/heads/master: ca9bdb9b279d3bffb7f8a0dc15686a2c23fa0c12
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 55ae8f95e663..e4605a965084 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -122,6 +122,8 @@ do {								 \
 		dev_info(&bp->pdev->dev, fmt, ##__VA_ARGS__);	 \
 } while (0)
 
+/* Error handling */
+void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int);
 #ifdef BNX2X_STOP_ON_ERROR
 #define bnx2x_panic()				\
 do {						\
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 4635c025bc2d..aee7671ff4c1 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -479,8 +479,6 @@ int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);
  */
 void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value);
 /* Error handling */
-void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int);
-
 void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl);
 
 /* validate currect fw is loaded */