[U-Boot] [PATCH] Fix the function conflict in x86emu when DEBUG is on

[Wolfgang Denk]

Dear Jason Jin,

In message <1224038424-14173-1-git-send-email-Jason.jin at freescale.com> you wrote:
> 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 at freescale.com>
> ---
>  drivers/bios_emulator/x86emu/debug.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
[Braddock:] Mr. Churchill, you are drunk.
[Churchill:] And you madam, are ugly.  But I shall be sober tomorrow.