forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
268bcca1e7
commit
53a10565be
@ -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" }
|
||||
|
Loading…
Reference in New Issue
Block a user