From: Andrew Morton <akpm@linux-foundation.org>
Date: Sun, 10 Feb 2008 07:42:17 +0000 (-0800)
Subject: starfire: secton fix
X-Git-Tag: v2.6.25-rc1~7^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=da219b7c69bd5219fe63b1f2fc2c96eb7a21d2c6;p=linux-2.6-omap-h63xx.git

starfire: secton fix

gcc-3.4.4 on powerpc:

drivers/net/starfire.c:219: 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>
---

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 6e00dc857af..c49214feae9 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -216,7 +216,7 @@ do { \
 
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __devinitdata =
+static char version[] =
 KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker <becker@scyld.com>\n"
 KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";