leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typhoon: section fix

Browse Source 
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>
This commit is contained in:
Andrew Morton 2008-02-09 23:40:34 -08:00 committed by David S. Miller
parent f4e64333f8
commit 952b3494cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/typhoon.c
View File

@ -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 const char version[] __devinitdata = static 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>");
@ -178,7 +178,7 @@ enum typhoon_cards {
}; };
/* directly indexed by enum typhoon_cards, above */ /* 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)", { "3Com Typhoon (3C990-TX)",
TYPHOON_CRYPTO_NONE}, TYPHOON_CRYPTO_NONE},
{ "3Com Typhoon (3CR990-TX-95)", { "3Com Typhoon (3CR990-TX-95)",