From: Andrew Morton <akpm@osdl.org>
Date: Tue, 15 Aug 2006 06:00:10 +0000 (-0700)
Subject: [PATCH] sundance section fix
X-Git-Tag: MMI-PSA29.97-13-9~47847^2~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3418e469ebaebec16f7df83074087eb901fb76b9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] sundance section fix

drivers/net/sundance.c:110: error: version causes a section type conflict

I don't understand this error.  It's referred to from both __init and
__devinit code.  With CONFIG_HOTPLUG=n, version[] is placed in .init.data and
is referred to from .init.text.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index ac17377b3e9f..698568e751da 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -107,7 +107,7 @@ static char *media[MAX_UNITS];
 #endif
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static char version[] =
 KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n"
 KERN_INFO "  http://www.scyld.com/network/sundance.html\n";