diff options
| author | Minkyu Kang <[email protected]> | 2010-01-15 22:41:58 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-01-15 22:41:58 +0900 |
| commit | e598dfc22c8789991d165714bec53b2390fc999d (patch) | |
| tree | cf3c704c4b00e06605bdfe23384b8af97022efa6 /examples/api/libgenwrap.c | |
| parent | e7ae13a57b4cbaa2cd3da8ffca614853d9d84230 (diff) | |
| parent | 1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm_cortexa8/s5pc1xx/cache.c
include/asm-arm/arch-s5pc1xx/sys_proto.h
include/sja1000.h
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'examples/api/libgenwrap.c')
| -rw-r--r-- | examples/api/libgenwrap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 2b62badfb88..2b107d9797f 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -74,7 +74,7 @@ void putc (const char c) ub_putc(c); } -void udelay(unsigned long usec) +void __udelay(unsigned long usec) { ub_udelay(usec); } |