Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a10565 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 268bcca1

drivers/net/bnx2x.c

+2 −2
Original line number Diff line number Diff line
@@ -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" }