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