diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
| commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
| tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /drivers/ks8695eth.c | |
| parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
| parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
| download | bootable_bootloader_goldelico_gta04-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip bootable_bootloader_goldelico_gta04-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz bootable_bootloader_goldelico_gta04-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2 | |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'drivers/ks8695eth.c')
| -rw-r--r-- | drivers/ks8695eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ks8695eth.c b/drivers/ks8695eth.c index a4b03ae..b598dd7 100644 --- a/drivers/ks8695eth.c +++ b/drivers/ks8695eth.c @@ -18,11 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef CONFIG_DRIVER_KS8695ETH - /****************************************************************************/ #include <common.h> + +#ifdef CONFIG_DRIVER_KS8695ETH #include <malloc.h> #include <net.h> #include <asm/io.h> @@ -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; } |