From 8311ef1f77e76c407e23844b01f296c440500f58 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 26 Feb 2009 10:19:24 +0000 Subject: [PATCH] --- yaml --- r: 134689 b: refs/heads/master c: 86de79b6d058df87fdf025c6c484b37340fb0205 h: refs/heads/master i: 134687: 83ef6cc01327bf9ad03dc5108e6e78d55a2ae53f v: v3 --- [refs] | 2 +- trunk/drivers/net/3c59x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2cd6a015b864..4f1b38003b82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81b700b1ed496cf21e7ed5991c80dfe5e6723266 +refs/heads/master: 86de79b6d058df87fdf025c6c484b37340fb0205 diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c index b2563d384cf2..c56698402420 100644 --- a/trunk/drivers/net/3c59x.c +++ b/trunk/drivers/net/3c59x.c @@ -102,8 +102,8 @@ static int vortex_debug = 1; #include -static char version[] __devinitdata = -DRV_NAME ": Donald Becker and others.\n"; +static const char version[] __devinitconst = + DRV_NAME ": Donald Becker and others.\n"; MODULE_AUTHOR("Donald Becker "); MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "); @@ -2908,7 +2908,7 @@ static void vortex_get_drvinfo(struct net_device *dev, strcpy(info->bus_info, pci_name(VORTEX_PCI(vp))); } else { if (VORTEX_EISA(vp)) - sprintf(info->bus_info, dev_name(vp->gendev)); + strcpy(info->bus_info, dev_name(vp->gendev)); else sprintf(info->bus_info, "EISA 0x%lx %d", dev->base_addr, dev->irq);