summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-08-14 23:00:08 -0700
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:44:28 -0400
commitc9d26c9785d900d8547b268f0c0507f252879c48 (patch)
treec5a7b9271bdb12eb59c0eae0e5280d2b4c6d25eb
parentc971ef46cb94b8bb4a12555fa757e5f67934fcd9 (diff)
downloadblackbird-op-linux-c9d26c9785d900d8547b268f0c0507f252879c48.tar.gz
blackbird-op-linux-c9d26c9785d900d8547b268f0c0507f252879c48.zip
[PATCH] winbond-840 section fix
With CONFIG_HOTPLUG=n it won't compile: drivers/net/tulip/winbond-840.c:141: error: version causes a section type conflict (For some reason it gets the same error if marked __initdata. Give up.) Cc: Valerie Henson <val_henson@linux.intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/tulip/winbond-840.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 7f414815cc62..eba9083da146 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -138,7 +138,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <asm/irq.h>
/* 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 " (2.4 port) " DRV_RELDATE " Donald Becker <becker@scyld.com>\n"
KERN_INFO " http://www.scyld.com/network/drivers.html\n";
OpenPOWER on IntegriCloud