* [patch 3/7] bnx2x section fix
@ 2008-02-08 11:11 akpm
2008-02-10 7:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2008-02-08 11:11 UTC (permalink / raw)
To: davem; +Cc: jeff, netdev, akpm, sam
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>
---
drivers/net/bnx2x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/bnx2x.c~bnx2x-section-fix drivers/net/bnx2x.c
--- a/drivers/net/bnx2x.c~bnx2x-section-fix
+++ a/drivers/net/bnx2x.c
@@ -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" }
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 3/7] bnx2x section fix
2008-02-08 11:11 [patch 3/7] bnx2x section fix akpm
@ 2008-02-10 7:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-02-10 7:16 UTC (permalink / raw)
To: akpm; +Cc: jeff, netdev, sam
From: akpm@linux-foundation.org
Date: Fri, 08 Feb 2008 03:11:15 -0800
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-10 7:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-08 11:11 [patch 3/7] bnx2x section fix akpm
2008-02-10 7:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).