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

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

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

drivers/net/bnx2.c

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