]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6971009) | patch
Fix the function conflict in x86emu when DEBUG is on
authorJason Jin <Jason.jin@freescale.com>
Wed, 15 Oct 2008 02:40:24 +0000 (10:40 +0800)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Oct 2008 23:14:37 +0000 (01:14 +0200)
commit9029b68f3f81b3013044f167ea025e836e6c8c0e
tree1d8ca036b43d4396ba94661fc683dd419d202d64tree | snapshot
parent69710092172409cfcc43b84cd71287f428a4e319commit | diff
Fix the function conflict in x86emu when DEBUG is on

The function parse_line() in common/main.c was exposed globally by commit
6636b62a6efc7f14e6e788788631ae7a7fca4537, Result in conflict with the same
name funciton in drivers/bios_emulator/x86emu/debug.c when define the DEBUG.
This patch fix this by renaming the function in the debug.c file.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
drivers/bios_emulator/x86emu/debug.c diff | blob | history
Cloned from git://git.denx.de/u-boot.git