diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-09 23:17:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 23:17:15 -0800 |
| commit | fefa864530766d8da2b8606235387c5173fb2309 (patch) | |
| tree | e3c70e3eca2bed80ec7fdfca3d638b6afaf40ada /drivers | |
| parent | 53a10565be7e4e6bdac65c81630bb048d679999e (diff) | |
| download | blackbird-op-linux-fefa864530766d8da2b8606235387c5173fb2309.tar.gz blackbird-op-linux-fefa864530766d8da2b8606235387c5173fb2309.zip | |
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')
| -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 @@ /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (5*HZ) -static const char version[] __devinitdata = +static char version[] __devinitdata = "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); @@ -90,7 +90,7 @@ typedef enum { } board_t; /* indexed by board_t, above */ -static const struct { +static struct { char *name; } board_info[] __devinitdata = { { "Broadcom NetXtreme II BCM5706 1000Base-T" }, |
