From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 12 Mar 2006 00:23:43 +0000 (+0100)
Subject: Cleanup compiler warnings.
X-Git-Tag: LABEL_2006_04_18_1106~7^2~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=611125a2925632c3281885e02836725ac1f6d8b0;p=oweals%2Fu-boot.git

Cleanup compiler warnings.
Patch by Greg Ungerer, 21 May 2005
---

diff --git a/CHANGELOG b/CHANGELOG
index e3003e0dda..b2adb3167b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup compiler warnings.
+  Patch by Greg Ungerer, 21 May 2005
+
 * Word alignment fixes for word aligned NS16550 UART
   Patch by Jean-Paul Saman, 01 Mar 2005
 
diff --git a/drivers/ks8695eth.c b/drivers/ks8695eth.c
index a4b03aee8c..a1bec1cc29 100644
--- a/drivers/ks8695eth.c
+++ b/drivers/ks8695eth.c
@@ -216,10 +216,10 @@ int eth_send(volatile void *packet, int len)
 		packet, len);
 
 	dp = &ks8695_tx[next];
-	memcpy((void *) dp->addr, packet, len);
+	memcpy((void *) dp->addr, (void *) packet, len);
 
 	if (len < 64) {
-		memset(dp->addr+len, 0, 64-len);
+		memset((void *) (dp->addr + len), 0, 64-len);
 		len = 64;
 	}