diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-10 02:17:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-10 02:17:15 -0500 |
commit | fefa864530766d8da2b8606235387c5173fb2309 (patch) | |
tree | e3c70e3eca2bed80ec7fdfca3d638b6afaf40ada /drivers/net | |
parent | 53a10565be7e4e6bdac65c81630bb048d679999e (diff) |
bnx2: section fix
gcc-3.4.4 on powerpc:
drivers/net/bnx2.c:67: 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')
-rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 8b552c6dd2e7..471c7f3e8a4a 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -64,7 +64,7 @@ | |||
64 | /* Time in jiffies before concluding the transmitter is hung. */ | 64 | /* Time in jiffies before concluding the transmitter is hung. */ |
65 | #define TX_TIMEOUT (5*HZ) | 65 | #define TX_TIMEOUT (5*HZ) |
66 | 66 | ||
67 | static const char version[] __devinitdata = | 67 | static char version[] __devinitdata = |
68 | "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; | 68 | "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; |
69 | 69 | ||
70 | MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); | 70 | MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); |
@@ -90,7 +90,7 @@ typedef enum { | |||
90 | } board_t; | 90 | } board_t; |
91 | 91 | ||
92 | /* indexed by board_t, above */ | 92 | /* indexed by board_t, above */ |
93 | static const struct { | 93 | static struct { |
94 | char *name; | 94 | char *name; |
95 | } board_info[] __devinitdata = { | 95 | } board_info[] __devinitdata = { |
96 | { "Broadcom NetXtreme II BCM5706 1000Base-T" }, | 96 | { "Broadcom NetXtreme II BCM5706 1000Base-T" }, |