Dear Jason Jin, In message <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> > --- > 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: [EMAIL PROTECTED] [Braddock:] Mr. Churchill, you are drunk. [Churchill:] And you madam, are ugly. But I shall be sober tomorrow. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
