From: Wolfgang Denk Date: Sun, 07 Sep 2008 00:40:07 +0200 Subject: [U-Boot] [PATCH 1/1] nvedit: rename error comment to CONFIG_ENV_IS_IN_ In-Reply-To: <1220147181-29804-1-git-send-email-plagnioj@jcrosoft.com> References: <1220146754-29407-25-git-send-email-plagnioj@jcrosoft.com> <1220147181-29804-1-git-send-email-plagnioj@jcrosoft.com> Message-ID: <20080906224007.8B32224815@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Jean-Christophe PLAGNIOL-VILLARD, In message <1220147181-29804-1-git-send-email-plagnioj@jcrosoft.com> you wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > common/cmd_nvedit.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c > index f5b93df..f449715 100644 > --- a/common/cmd_nvedit.c > +++ b/common/cmd_nvedit.c > @@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR; > !defined(CONFIG_ENV_IS_IN_ONENAND) && \ > !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ > !defined(CONFIG_ENV_IS_NOWHERE) > -# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} > +# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} > #endif Sorry: Applying nvedit: rename error comment to CONFIG_ENV_IS_IN_ error: patch failed: common/cmd_nvedit.c:60 error: common/cmd_nvedit.c: patch does not apply fatal: sha1 information is lacking or useless (common/cmd_nvedit.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. Please rebase and resubmit. 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 "There's always been Tower of Babel sort of bickering inside Unix, but this is the most extreme form ever. This means at least several years of confusion." - Bill Gates, founder and chairman of Microsoft, about the Open Systems Foundation