Hi! > > From: Dinh Nguyen <dingu...@altera.com> > > > > include/common.h has the reset_cpu defined already. No need to > > re-define here. > > > > Signed-off-by: Dinh Nguyen <dingu...@altera.com> > > Signed-off-by: Pavel Machek <pa...@denx.de> > > --- > > arch/arm/include/asm/arch-kirkwood/cpu.h | 1 - > > arch/arm/include/asm/arch-orion5x/cpu.h | 1 - > > 2 files changed, 2 deletions(-) > > > > diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h > > b/arch/arm/include/asm/arch-kirkwood/cpu.h > > index d28c51a..7a53c8f 100644 > > --- a/arch/arm/include/asm/arch-kirkwood/cpu.h > > +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h > > @@ -155,7 +155,6 @@ struct kwgpio_registers { > > /* > > * functions > > */ > > -void reset_cpu(unsigned long ignored); > > unsigned char get_random_hex(void); > > unsigned int kw_sdram_bar(enum memory_bank bank); > > unsigned int kw_sdram_bs(enum memory_bank bank); > > diff --git a/arch/arm/include/asm/arch-orion5x/cpu.h > > b/arch/arm/include/asm/arch-orion5x/cpu.h > > index 2f52ca8..17b9b69 100644 > > --- a/arch/arm/include/asm/arch-orion5x/cpu.h > > +++ b/arch/arm/include/asm/arch-orion5x/cpu.h > > @@ -251,7 +251,6 @@ struct orion5x_ddr_addr_decode_registers { > > /* > > * functions > > */ > > -void reset_cpu(unsigned long ignored); > > u32 orion5x_device_id(void); > > u32 orion5x_device_rev(void); > > unsigned int orion5x_winctrl_calcsize(unsigned int sizeval); > > -- > > Acked-By: Prafulla Wadaskar <prafu...@marvell.com> > > BTW: you could have made this patch independent so that it could be pulled > independently.
It is independend... Feel free to just apply it. Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot