From 7029394d822a7d9e8ccb12d9679030b462e1052f Mon Sep 17 00:00:00 2001 From: Dinh Nguyen Date: Fri, 14 Sep 2012 11:08:28 +0000 Subject: [PATCH] ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.h include/common.h has the reset_cpu defined already. No need to re-define here. Signed-off-by: Dinh Nguyen Signed-off-by: Pavel Machek Acked-By: Prafulla Wadaskar --- 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 23783d5432..57bfe8e78b 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 2f52ca8407..17b9b69be5 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); -- 2.25.1