[U-Boot] [PATCHv3 3/5] omap3: remove typedefs for configuration structs

Wolfgang Denk
2009-08-07T21:39:51Z

Dear Matthias Ludwig,

In message <042680c935ee2a71d7cd006d3fd5c01e7893b2db.1242716287.git.mludwig@ultratronik.de> you wrote:
> Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
> ---
> board/omap3/beagle/beagle.c | 6 ++--
> board/omap3/evm/evm.c | 6 ++--
> board/omap3/pandora/pandora.c | 8 +++---
> board/omap3/zoom2/zoom2.c | 2 +-
> cpu/arm_cortexa8/omap3/board.c | 16 ++++++------
> cpu/arm_cortexa8/omap3/clock.c | 14 +++++-----
> cpu/arm_cortexa8/omap3/mem.c | 14 +++++-----
> cpu/arm_cortexa8/omap3/sys_info.c | 12 ++++----
> cpu/arm_cortexa8/omap3/timer.c | 2 +-
> drivers/mtd/nand/omap_gpmc.c | 2 +-
> include/asm-arm/arch-omap3/cpu.h | 50 ++++++++++++++++++------------------
> include/asm-arm/arch-omap3/mem.h | 4 +-
> include/asm-arm/arch-omap3/omap3.h | 8 +++---
> include/configs/omap3_beagle.h | 2 +-
> include/configs/omap3_evm.h | 2 +-
> include/configs/omap3_overo.h | 2 +-
> include/configs/omap3_pandora.h | 2 +-
> include/configs/omap3_zoom1.h | 2 +-
> include/configs/omap3_zoom2.h | 2 +-
> 19 files changed, 78 insertions(+), 78 deletions(-)

Sorry, this does not apply, and the required changes may be small,
but are non-trivial for me:

Applying: omap3: remove typedefs for configuration structs
error: patch failed: board/omap3/beagle/beagle.c:74
error: board/omap3/beagle/beagle.c: patch does not apply
error: patch failed: board/omap3/pandora/pandora.c:59
error: board/omap3/pandora/pandora.c: patch does not apply
fatal: sha1 information is lacking or useless (board/omap3/evm/evm.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
When a child is taught ... its programmed with simple instructions --
and at some point, if its mind develops properly, it exceeds the sum
of what it was taught, thinks independently.
-- Dr. Richard Daystrom, "The Ultimate Computer",
stardate 4731.3.