summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/winbond-840.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-29 23:55:59 +0200
committerJeff Garzik <jeff@garzik.org>2006-08-29 23:55:59 +0200
commitb01e86fee6c821e4e003fd4e9f65453ac478a58e (patch)
tree21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/tulip/winbond-840.c
parentRename libata-bmdma.c to libata-sff.c. (diff)
parentLinux v2.6.18-rc5 (diff)
downloadlinux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.tar.xz
linux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.zip
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/tulip/winbond-840.c')
-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";