Dear Peter Tyser, In message <1291393727-337-1-git-send-email-pty...@xes-inc.com> you wrote: > The following commit: > > commit 882b7d726febe65579d6502c271412ecb05821d7 > Author: Mike Frysinger <vap...@gentoo.org> > Date: Wed Oct 20 03:41:17 2010 -0400 > > do_reset: unify duplicate prototypes > > missed the 74xx_7xx and mpc86xx arches and the ppmc7xx board do_reset() > functions which resulted in build errors such as: > cpu.c:128: error: conflicting types for 'do_reset' > include/command.h:102: error: previous declaration of 'do_reset' was here > > Signed-off-by: Peter Tyser <pty...@xes-inc.com> > --- > arch/powerpc/cpu/74xx_7xx/cpu.c | 10 +++++++--- > arch/powerpc/cpu/mpc86xx/cpu.c | 5 +++-- > board/ppmc7xx/ppmc7xx.c | 7 +++++-- > 3 files changed, 15 insertions(+), 7 deletions(-)
Applied to "next", thanks. 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: w...@denx.de Suppose for a moment that the automobile industry had developed at the same rate as computers and over the same period: how much cheaper and more efficient would the current models be? If you have not al- ready heard the analogy, the answer is shattering. Today you would be able to buy a Rolls-Royce for $2.75, it would do three million miles to the gallon, and it would deliver enough power to drive the Queen Elizabeth II. And if you were interested in miniaturization, you could place half a dozen of them on a pinhead. - Christopher Evans _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot