bnx2.c section fix
Subsystems (2)
PATCH 4/7 bnx2.c section fix
From: Andrew Morton <[email protected]>
gcc-3.4.4 on powerpc:
drivers/net/bnx2.c:67: error: version causes a section type conflict
Cc Jeff Garzik <[email protected]>
Cc Sam Ravnborg <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/bnx2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/bnx2.c renamed from drivers/net/bnx2.c~bnx2c-section-fix +2 -2
@@ -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 <[email protected]>" );
@@ -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" },
_
From: [email protected]
Date: Fri, 08 Feb 2008 03:11:15 -0800
Quoted 9 lines
From: Andrew Morton <[email protected]>
gcc-3.4.4 on powerpc:
drivers/net/bnx2.c:67: error: version causes a section type conflictCc Jeff Garzik <[email protected]>Cc Sam Ravnborg <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Applied.