summaryrefslogtreecommitdiff
path: root/examples/standalone/eepro100_eeprom.c
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-03-23 19:09:13 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-03-23 19:09:13 +0900
commit45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch)
tree8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /examples/standalone/eepro100_eeprom.c
parent995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff)
parentd650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: cpu/arm920t/ep93xx/timer.c Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'examples/standalone/eepro100_eeprom.c')
-rw-r--r--examples/standalone/eepro100_eeprom.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/standalone/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c
index 2b15d05adbb..771a7e887e4 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) {