commit 3dbad80ac7632f243b824d469301abb97ec634a1
author David S. Miller <davem@sunset.davemloft.net> Thu Mar 29 19:16:03 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:28:27 2007 -0700
tree 321da325189eff0fe04226d09398be727d71b349
parent c45d286e72dd72c0229dc9e2849743ba427fee84

[NET]: Fix warnings in 3c523.c and ni52.c

We have to put back the cast to "char *" because these
pointers are volatile.

Reported by Andrew Morton.

Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/3c523.c

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index a384f7d..da1a22c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -1145,7 +1145,7 @@
 
 	if (len != skb->len)
 		memset((char *) p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
-	skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len);
+	skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
 
 #if (NUM_XMIT_BUFFS == 1)
 #ifdef NO_NOPCOMMANDS

drivers/net/ni52.c

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 8646698..8dbd6d1 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -1182,7 +1182,7 @@
 	else
 #endif
 	{
-		skb_copy_from_linear_data(skb, p->xmit_cbuffs[p->xmit_count], skb->len);
+		skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
 		len = skb->len;
 		if (len < ETH_ZLEN) {
 			len = ETH_ZLEN;