In message <[EMAIL PROTECTED]> you wrote: > From: Michal Simek <[EMAIL PROTECTED]> > > there are some long lines in config file > but this patches clean a lot of coding style issues > > There could be small problem with Daniel name. > Please check it in merge > > Signed-off-by: Michal Simek <[EMAIL PROTECTED]> > --- > include/configs/sc520_spunk.h | 132 > +++++++++++++++++++---------------------- > 1 files changed, 62 insertions(+), 70 deletions(-) > > diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h > index b7fa16e..bd6a599 100644 > --- a/include/configs/sc520_spunk.h > +++ b/include/configs/sc520_spunk.h > @@ -1,6 +1,6 @@ > /* > * (C) Copyright 2002 > - * Daniel Engström, Omicron Ceti AB, [EMAIL PROTECTED] > + * Daniel Engström, Omicron Ceti AB, [EMAIL PROTECTED]
I fixed this problem with the 'ö', but the patch still doesn't apply: error: patch failed: include/configs/sc520_spunk.h:86 error: include/configs/sc520_spunk.h: patch does not apply fatal: sha1 information is lacking or useless (include/configs/sc520_spunk.h). 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: [EMAIL PROTECTED] There are 2 Kinds of planes: Fighters, and targets. There are 2 Kinds of boats: Submarines, and targets. There are 2 Kinds of 4x4's: Jeeps and SOB's (Some other brand) There are 2 Kinds of OS's: Unix, and brain-farts. ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ U-Boot-Users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
