| commit | 9029b68f3f81b3013044f167ea025e836e6c8c0e | [log] [tgz] |
|---|---|---|
| author | Jason Jin <Jason.jin@freescale.com> | Wed Oct 15 10:40:24 2008 +0800 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Oct 17 01:14:37 2008 +0200 |
| tree | 1d8ca036b43d4396ba94661fc683dd419d202d64 | |
| parent | 69710092172409cfcc43b84cd71287f428a4e319 [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>