diff options
| author | Minkyu Kang <[email protected]> | 2010-04-19 10:26:18 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-04-19 10:26:18 +0900 |
| commit | 83653121d7382fccfe329cb732f77f116341ef1d (patch) | |
| tree | 0b1ce6764252af15dfb2614372de98a44a7ec61f /include/asm-microblaze/string.h | |
| parent | 0f1f21a345e02a68ec16f7ab9e7dc687f9276089 (diff) | |
| parent | 07739bcef5da07cc4a4edef8b91014ccc332eda3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm1176/cpu.c
cpu/arm1176/start.S
cpu/arm_cortexa8/s5pc1xx/Makefile
cpu/arm_cortexa8/s5pc1xx/clock.c
drivers/serial/serial_s5p.c
include/asm-arm/arch-s5pc1xx/clk.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/uart.h
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'include/asm-microblaze/string.h')
| -rw-r--r-- | include/asm-microblaze/string.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/asm-microblaze/string.h b/include/asm-microblaze/string.h deleted file mode 100644 index 724f5bdfa65..00000000000 --- a/include/asm-microblaze/string.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * include/asm-microblaze/string.h -- Architecture specific string routines - * - * Copyright (C) 2003 John Williams <[email protected]> - * Copyright (C) 2001,2002 NEC Corporation - * Copyright (C) 2001,2002 Miles Bader <[email protected]> - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file COPYING in the main directory of this - * archive for more details. - * - * Written by Miles Bader <[email protected]> - * Microblaze port by John Williams - */ - -#ifndef __MICROBLAZE_STRING_H__ -#define __MICROBLAZE_STRING_H__ - -#if 0 -#define __HAVE_ARCH_BCOPY -#define __HAVE_ARCH_MEMCPY -#define __HAVE_ARCH_MEMSET -#define __HAVE_ARCH_MEMMOVE - -extern void *memcpy (void *, const void *, __kernel_size_t); -extern void bcopy (const char *, char *, int); -extern void *memset (void *, int, __kernel_size_t); -extern void *memmove (void *, const void *, __kernel_size_t); -#endif - -#endif /* __MICROBLAZE_STRING_H__ */ |