Dear =?ISO-8859-1?Q?Andr=E9?= Schwarz, In message <1247842785.3953.90.ca...@swa-m460> you wrote: > This patch adds and uses common code for all Matrix Vision boards. > > Signed-off-by: Andr=C3=A9 Schwarz <[email protected]> > --- > > Heiko's comments have been addressed and common/mv_common.h has been > included where needed. > > > board/matrix_vision/common/Makefile | 54 ++++++++++++++ > board/matrix_vision/common/mv_common.c | 125 > ++++++++++++++++++++++++++++++++ > board/matrix_vision/common/mv_common.h | 25 +++++++ > board/matrix_vision/mvbc_p/mvbc_p.c | 76 +------------------- > board/matrix_vision/mvblm7/mvblm7.c | 38 +++------- > board/matrix_vision/mvblm7/pci.c | 35 ++-------- > include/configs/MVBC_P.h | 14 +++- > include/configs/MVBLM7.h | 49 +++++-------- > 8 files changed, 254 insertions(+), 162 deletions(-)
Sorry, this patch doesn't apply: /home/wd/git/u-boot/work/.git/rebase-apply/patch:179: trailing whitespace. error: patch failed: include/configs/MVBC_P.h:68 error: include/configs/MVBC_P.h: patch does not apply fatal: sha1 information is lacking or useless (board/matrix_vision/mvbc_p/mvbc_p.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. Please clean up 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] panic: can't find / _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
