diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-09 23:16:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 23:16:41 -0800 |
| commit | 53a10565be7e4e6bdac65c81630bb048d679999e (patch) | |
| tree | 7501ed974884da7030d399256fc60bf9ebb10fb7 | |
| parent | 268bcca1e7b0d244afd07ea89cda672e61b0fc4a (diff) | |
| download | kernel_samsung_smdk4412-53a10565be7e4e6bdac65c81630bb048d679999e.zip kernel_samsung_smdk4412-53a10565be7e4e6bdac65c81630bb048d679999e.tar.gz kernel_samsung_smdk4412-53a10565be7e4e6bdac65c81630bb048d679999e.tar.bz2 | |
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>
| -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 4a73c88..afc7f34 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c @@ -70,7 +70,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 577xx 10Gigabit Ethernet Driver " DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; @@ -107,7 +107,7 @@ enum bnx2x_board_type { }; /* indexed by board_t, above */ -static const struct { +static struct { char *name; } board_info[] __devinitdata = { { "Broadcom NetXtreme II BCM57710 XGb" } |