diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /examples/eepro100_eeprom.c | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'examples/eepro100_eeprom.c')
| -rw-r--r-- | examples/eepro100_eeprom.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/eepro100_eeprom.c b/examples/eepro100_eeprom.c index a52e68d4e7..2b15d05adb 100644 --- a/examples/eepro100_eeprom.c +++ b/examples/eepro100_eeprom.c @@ -17,8 +17,9 @@ * and release the resulting code under the GPL. */ -#define _PPC_STRING_H_ /* avoid unnecessary str/mem functions */ -#define _LINUX_STRING_H_ /* avoid unnecessary str/mem functions */ +/* avoid unnecessary memcpy function */ +#define __HAVE_ARCH_MEMCPY +#define _PPC_STRING_H_ #include <common.h> #include <exports.h> |