diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-09 23:40:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 23:40:34 -0800 |
| commit | 952b3494cf9d4ff7f48c13363393cab15cde056f (patch) | |
| tree | 9cdc14498b6f1b2114f3eec27daf823995d97a5d /drivers/net/typhoon.c | |
| parent | f4e64333f829af6b2fe536b0f556d7a6b561c0ef (diff) | |
| download | linux-3.10-952b3494cf9d4ff7f48c13363393cab15cde056f.tar.gz linux-3.10-952b3494cf9d4ff7f48c13363393cab15cde056f.tar.bz2 linux-3.10-952b3494cf9d4ff7f48c13363393cab15cde056f.zip | |
typhoon: section fix
gcc-3.4.4 on powerpc:
drivers/net/typhoon.c:137: error: version causes a section type conflict
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index f50cb520dff..333961bb787 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -134,7 +134,7 @@ static const int multicast_filter_limit = 32; #include "typhoon.h" #include "typhoon-firmware.h" -static const char version[] __devinitdata = +static char version[] __devinitdata = "typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; MODULE_AUTHOR("David Dillow <dave@thedillows.org>"); @@ -178,7 +178,7 @@ enum typhoon_cards { }; /* directly indexed by enum typhoon_cards, above */ -static const struct typhoon_card_info typhoon_card_info[] __devinitdata = { +static struct typhoon_card_info typhoon_card_info[] __devinitdata = { { "3Com Typhoon (3C990-TX)", TYPHOON_CRYPTO_NONE}, { "3Com Typhoon (3CR990-TX-95)", |