diff options
| author |   Randy Dunlap <rdunlap@xenotime.net> | 2006-04-10 23:22:06 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2006-04-12 18:08:45 -0400 |
| commit | e19360f2945f54eb44ae170ec9c33910d29834a2 (patch) | |
| tree | c9959bb3d5a91efd21ca43c556544a7b0c1842bc /drivers/net/bnx2.c | |
| parent | [PATCH] remove drivers/net/hydra.h (diff) | |
| download | linux-dev-e19360f2945f54eb44ae170ec9c33910d29834a2.tar.xz linux-dev-e19360f2945f54eb44ae170ec9c33910d29834a2.zip | |
[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>
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 2671da20a496..5ca99e26660a 100644 --- a/drivers/net/bnx2.c +++ b/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 <mchan@broadcom.com>"); |