[PATCH] net drivers: fix section attributes for gcc
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 <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
037998d1e9
commit
e19360f294
|
@ -63,7 +63,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 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";
|
"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
|
||||||
|
|
||||||
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
|
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
|
||||||
|
|
|
@ -238,7 +238,7 @@ static int full_duplex[MAX_UNITS];
|
||||||
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
|
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
|
||||||
|
|
||||||
/* These identify the driver base version and may not be removed. */
|
/* 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 "
|
KERN_INFO DRV_NAME " dp8381x driver, version "
|
||||||
DRV_VERSION ", " DRV_RELDATE "\n"
|
DRV_VERSION ", " DRV_RELDATE "\n"
|
||||||
KERN_INFO " originally by Donald Becker <becker@scyld.com>\n"
|
KERN_INFO " originally by Donald Becker <becker@scyld.com>\n"
|
||||||
|
|
|
@ -335,7 +335,7 @@ do { \
|
||||||
|
|
||||||
|
|
||||||
/* These identify the driver base version and may not be removed. */
|
/* 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 <becker@scyld.com>\n"
|
KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <becker@scyld.com>\n"
|
||||||
KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
|
KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ static const int multicast_filter_limit = 32;
|
||||||
#include "typhoon.h"
|
#include "typhoon.h"
|
||||||
#include "typhoon-firmware.h"
|
#include "typhoon-firmware.h"
|
||||||
|
|
||||||
static char version[] __devinitdata =
|
static const char version[] __devinitdata =
|
||||||
"typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
|
"typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
|
||||||
|
|
||||||
MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
|
MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
|
||||||
|
|
Loading…
Reference in a new issue