[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200802081120.m18BK8HR021632@imap1.linux-foundation.org>
Date: Fri, 08 Feb 2008 03:11:15 -0800
From: akpm@...ux-foundation.org
To: davem@...emloft.net
Cc: jeff@...zik.org, netdev@...r.kernel.org, akpm@...ux-foundation.org,
sam@...nborg.org
Subject: [patch 4/7] bnx2.c section fix
From: Andrew Morton <akpm@...ux-foundation.org>
gcc-3.4.4 on powerpc:
drivers/net/bnx2.c:67: error: version causes a section type conflict
Cc: Jeff Garzik <jeff@...zik.org>
Cc: Sam Ravnborg <sam@...nborg.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/bnx2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/bnx2.c~bnx2c-section-fix drivers/net/bnx2.c
--- a/drivers/net/bnx2.c~bnx2c-section-fix
+++ a/drivers/net/bnx2.c
@@ -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@...adcom.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" },
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists