From: Randy Dunlap <[EMAIL PROTECTED]>
If CONFIG_HOTPLUG=n, gcc doesn't like some __initdata to be
const (rodata) and other __initdata not const, so make the
non-const __initdata const.
gcc errors:
drivers/net/bnx2.c:66: error: version causes a section type conflict
drivers/net/starfire.c:338: error: version causes a section type conflict
drivers/net/typhoon.c:137: error: version causes a section type conflict
drivers/net/natsemi.c:241: error: version causes a section type conflict
Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
---
drivers/net/bnx2.c | 2 +-
drivers/net/natsemi.c | 2 +-
drivers/net/starfire.c | 2 +-
drivers/net/typhoon.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- linux-2617-rc1.orig/drivers/net/bnx2.c
+++ linux-2617-rc1/drivers/net/bnx2.c
@@ -63,7 +63,7 @@
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (5*HZ)
-static char version[] __devinitdata =
+static const 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]>");
--- linux-2617-rc1.orig/drivers/net/natsemi.c
+++ linux-2617-rc1/drivers/net/natsemi.c
@@ -238,7 +238,7 @@ static int full_duplex[MAX_UNITS];
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
KERN_INFO DRV_NAME " dp8381x driver, version "
DRV_VERSION ", " DRV_RELDATE "\n"
KERN_INFO " originally by Donald Becker <[EMAIL PROTECTED]>\n"
--- linux-2617-rc1.orig/drivers/net/starfire.c
+++ linux-2617-rc1/drivers/net/starfire.c
@@ -335,7 +335,7 @@ do { \
/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <[EMAIL
PROTECTED]>\n"
KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", "
DRV_RELDATE ")\n";
--- linux-2617-rc1.orig/drivers/net/typhoon.c
+++ linux-2617-rc1/drivers/net/typhoon.c
@@ -134,7 +134,7 @@ static const int multicast_filter_limit
#include "typhoon.h"
#include "typhoon-firmware.h"
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
"typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David Dillow <[EMAIL PROTECTED]>");
---
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
