From: Wolfgang Denk <wd@denx.de>
Date: Fri, 12 Mar 2010 21:11:00 +0000 (+0100)
Subject: standalone eepro100_eeprom: fix build error
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4e72fb15c9073129e05820cc9c54f54bc4985835;p=u-boot.git

standalone eepro100_eeprom: fix build error

Building examples/standalone/eepro100_eeprom triggers this error:

In file included from include/common.h:629,
                 from eepro100_eeprom.c:24:
include/net.h: In function 'NetReadIP':
include/net.h:430: warning: implicit declaration of function 'memcpy'
eepro100_eeprom.c: At top level:
eepro100_eeprom.c:81: error: conflicting types for 'memcpy'
include/net.h:430: error: previous implicit declaration of 'memcpy' was here

Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/examples/standalone/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c
index 2b15d05adb..771a7e887e 100644
--- a/examples/standalone/eepro100_eeprom.c
+++ b/examples/standalone/eepro100_eeprom.c
@@ -18,7 +18,6 @@
  */
 
 /* avoid unnecessary memcpy function */
-#define __HAVE_ARCH_MEMCPY
 #define _PPC_STRING_H_
 
 #include <common.h>
@@ -77,7 +76,7 @@ static inline short inw(long addr)
 	return swap16(*(volatile short *)(addr));
 }
 
-static inline void *memcpy(void *dst, const void *src, unsigned int len)
+void *memcpy(void *dst, const void *src, unsigned int len)
 {
 	char *ret = dst;
 	while (len-- > 0) {