From ba2dacab305c598cd4c34a604f8e276bf5bab5ff Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 12 May 2000 21:05:59 +0000
Subject: Merge with Linux 2.3.99-pre7 and various other bits.

---
 drivers/net/wan/cosa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/net/wan/cosa.c')

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 8e0c5d37d..6d3f6a8a9 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -588,7 +588,7 @@ static void sppp_channel_init(struct channel_data *chan)
 	memset(chan->pppdev.dev, 0, sizeof(struct net_device));
 	sppp_attach(&chan->pppdev);
 	d=chan->pppdev.dev;
-	d->name = chan->name;
+	strcpy(d->name, chan->name);
 	d->base_addr = chan->cosa->datareg;
 	d->irq = chan->cosa->irq;
 	d->dma = chan->cosa->dma;
-- 
cgit v1.2.3