[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200802081120.m18BK6cL021623@imap1.linux-foundation.org>
Date: Fri, 08 Feb 2008 03:11:13 -0800
From: akpm@...ux-foundation.org
To: davem@...emloft.net
Cc: jeff@...zik.org, netdev@...r.kernel.org, akpm@...ux-foundation.org,
sam@...nborg.org
Subject: [patch 1/7] typhoon section fix
From: Andrew Morton <akpm@...ux-foundation.org>
gcc-3.4.4 on powerpc:
drivers/net/typhoon.c:137: error: version causes a section type conflict
Cc: Jeff Garzik <jeff@...zik.org>
Cc: Sam Ravnborg <sam@...nborg.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/typhoon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/typhoon.c~typhoon-section-fix drivers/net/typhoon.c
--- a/drivers/net/typhoon.c~typhoon-section-fix
+++ a/drivers/net/typhoon.c
@@ -134,7 +134,7 @@ static const int multicast_filter_limit
#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@...dillows.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)",
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists