提交 53a10565 编写于 作者: A Andrew Morton 提交者: David S. Miller

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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 268bcca1
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
/* Time in jiffies before concluding the transmitter is hung. */ /* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (5*HZ) #define TX_TIMEOUT (5*HZ)
static const char version[] __devinitdata = static char version[] __devinitdata =
"Broadcom NetXtreme II 577xx 10Gigabit Ethernet Driver " "Broadcom NetXtreme II 577xx 10Gigabit Ethernet Driver "
DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
...@@ -107,7 +107,7 @@ enum bnx2x_board_type { ...@@ -107,7 +107,7 @@ enum bnx2x_board_type {
}; };
/* indexed by board_t, above */ /* indexed by board_t, above */
static const struct { static struct {
char *name; char *name;
} board_info[] __devinitdata = { } board_info[] __devinitdata = {
{ "Broadcom NetXtreme II BCM57710 XGb" } { "Broadcom NetXtreme II BCM57710 XGb" }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册