From: Mike Frysinger Date: Tue, 25 Aug 2009 06:16:24 -0400 Subject: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED In-Reply-To: <1251189967-11702-1-git-send-email-albin.tonnerre@free-electrons.com> References: <20090813192447.A78EF833DBD2@gemini.denx.de> <1251189967-11702-1-git-send-email-albin.tonnerre@free-electrons.com> Message-ID: <200908250616.27669.vapier@gentoo.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tuesday 25 August 2009 04:46:07 Albin Tonnerre 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 this is only an issue for the "next" branch ... my local git tree has the right number of #endif's, so i guess i must have sent out the wrong patch guess this needs to get squashed into the relevant change rather than added as a new commit. thanks for the update. -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. Url : http://lists.denx.de/pipermail/u-boot/attachments/20090825/debab938/attachment.pgp