diff options
author | Jason Jin <Jason.jin@freescale.com> | 2008-10-15 10:40:24 +0800 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-17 01:14:37 +0200 |
commit | 9029b68f3f81b3013044f167ea025e836e6c8c0e (patch) | |
tree | 1d8ca036b43d4396ba94661fc683dd419d202d64 /microblaze_config.mk | |
parent | 69710092172409cfcc43b84cd71287f428a4e319 (diff) | |
download | u-boot-imx-9029b68f3f81b3013044f167ea025e836e6c8c0e.zip u-boot-imx-9029b68f3f81b3013044f167ea025e836e6c8c0e.tar.gz u-boot-imx-9029b68f3f81b3013044f167ea025e836e6c8c0e.tar.bz2 |
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>
Diffstat (limited to 'microblaze_config.mk')
0 files changed, 0 insertions, 0 deletions