diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2010-07-27 08:33:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-27 23:35:40 -0400 |
| commit | b0efbb996e8554ed8fe59e3f79e0bc83218083ab (patch) | |
| tree | 06d9b551bd7d5fd166cf49a270b8232243ad390f | |
| parent | 5d7cd49622af9396643f8d2c5ed17039d89fef14 (diff) | |
bnx2x: move global variable load_count to bnx2x.h
This will allow access to this global variable (used in no-mcp
mode) from different object files.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 8 | ||||
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 237609f84855..4afd29201a5c 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
| @@ -1373,6 +1373,14 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, | |||
| 1373 | #define BNX2X_VPD_LEN 128 | 1373 | #define BNX2X_VPD_LEN 128 |
| 1374 | #define VENDOR_ID_LEN 4 | 1374 | #define VENDOR_ID_LEN 4 |
| 1375 | 1375 | ||
| 1376 | #ifdef BNX2X_MAIN | ||
| 1377 | #define BNX2X_EXTERN | ||
| 1378 | #else | ||
| 1379 | #define BNX2X_EXTERN extern | ||
| 1380 | #endif | ||
| 1381 | |||
| 1382 | BNX2X_EXTERN int load_count[3]; /* 0-common, 1-port0, 2-port1 */ | ||
| 1383 | |||
| 1376 | /* MISC_REG_RESET_REG - this is here for the hsi to work don't touch */ | 1384 | /* MISC_REG_RESET_REG - this is here for the hsi to work don't touch */ |
| 1377 | 1385 | ||
| 1378 | #endif /* bnx2x.h */ | 1386 | #endif /* bnx2x.h */ |
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 1e0ac8bb246f..0beaefb7a160 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | #include <linux/io.h> | 51 | #include <linux/io.h> |
| 52 | #include <linux/stringify.h> | 52 | #include <linux/stringify.h> |
| 53 | 53 | ||
| 54 | 54 | #define BNX2X_MAIN | |
| 55 | #include "bnx2x.h" | 55 | #include "bnx2x.h" |
| 56 | #include "bnx2x_init.h" | 56 | #include "bnx2x_init.h" |
| 57 | #include "bnx2x_init_ops.h" | 57 | #include "bnx2x_init_ops.h" |
| @@ -121,8 +121,6 @@ static int debug; | |||
| 121 | module_param(debug, int, 0); | 121 | module_param(debug, int, 0); |
| 122 | MODULE_PARM_DESC(debug, " Default debug msglevel"); | 122 | MODULE_PARM_DESC(debug, " Default debug msglevel"); |
| 123 | 123 | ||
| 124 | static int load_count[3]; /* 0-common, 1-port0, 2-port1 */ | ||
| 125 | |||
| 126 | static struct workqueue_struct *bnx2x_wq; | 124 | static struct workqueue_struct *bnx2x_wq; |
| 127 | 125 | ||
| 128 | enum bnx2x_board_type { | 126 | enum bnx2x_board_type { |
