diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-10 02:16:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-10 02:16:41 -0500 |
commit | 53a10565be7e4e6bdac65c81630bb048d679999e (patch) | |
tree | 7501ed974884da7030d399256fc60bf9ebb10fb7 /drivers/net/bnx2x.c | |
parent | 268bcca1e7b0d244afd07ea89cda672e61b0fc4a (diff) |
bnx2x: section fix
From: Andrew Morton <akpm@linux-foundation.org>
gcc-3.4.4 on powerpc:
drivers/net/bnx2x.c:73: error: version causes a section type conflict
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.c')
-rw-r--r-- | drivers/net/bnx2x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index 4a73c884d0c4..afc7f34b1dcf 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c | |||
@@ -70,7 +70,7 @@ | |||
70 | /* Time in jiffies before concluding the transmitter is hung. */ | 70 | /* Time in jiffies before concluding the transmitter is hung. */ |
71 | #define TX_TIMEOUT (5*HZ) | 71 | #define TX_TIMEOUT (5*HZ) |
72 | 72 | ||
73 | static const char version[] __devinitdata = | 73 | static char version[] __devinitdata = |
74 | "Broadcom NetXtreme II 577xx 10Gigabit Ethernet Driver " | 74 | "Broadcom NetXtreme II 577xx 10Gigabit Ethernet Driver " |
75 | DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; | 75 | DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; |
76 | 76 | ||
@@ -107,7 +107,7 @@ enum bnx2x_board_type { | |||
107 | }; | 107 | }; |
108 | 108 | ||
109 | /* indexed by board_t, above */ | 109 | /* indexed by board_t, above */ |
110 | static const struct { | 110 | static struct { |
111 | char *name; | 111 | char *name; |
112 | } board_info[] __devinitdata = { | 112 | } board_info[] __devinitdata = { |
113 | { "Broadcom NetXtreme II BCM57710 XGb" } | 113 | { "Broadcom NetXtreme II BCM57710 XGb" } |