Re: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED

Dear Albin Tonnerre,

In message 1251189967-11702-1-git-send-email-albin.tonnerre@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.tonnerre@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