summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:23:43 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:23:43 +0100
commit611125a2925632c3281885e02836725ac1f6d8b0 (patch)
tree2b9fd9eac3644d04c9cc46a868160a1742599571
parent2281490485ef2c76f93bf37a5014f5e630d5a3d0 (diff)
downloadu-boot-imx-611125a2925632c3281885e02836725ac1f6d8b0.zip
u-boot-imx-611125a2925632c3281885e02836725ac1f6d8b0.tar.gz
u-boot-imx-611125a2925632c3281885e02836725ac1f6d8b0.tar.bz2
Cleanup compiler warnings.
Patch by Greg Ungerer, 21 May 2005
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/ks8695eth.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e3003e0..b2adb31 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 a4b03ae..a1bec1c 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;
}