Dear Albin Tonnerre, In message <1251189967-11702-1-git-send-email-albin.tonne...@free-electrons.com> you wrote: > Commit 16fc32f introduced an error in include/environment.h, which makes > u-boot > fail to compile due to a missing #endif. > This also fixes a merge conflict remaining in include/configs/EB+MCF-EV123.h > which was caused by the same commit > > Signed-off-by: Albin Tonnerre <albin.tonne...@free-electrons.com> > --- > include/configs/EB+MCF-EV123.h | 7 ------- > include/environment.h | 1 + > 2 files changed, 1 insertions(+), 7 deletions(-)
Applied to "next" branch (and rebased "next" to clean up the mess). Thanks for catching / fixing this. 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: w...@denx.de You don't have to worry about me. I might have been born yesterday... but I stayed up all night. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot