Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952b3494 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4e64333

drivers/net/typhoon.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)",