]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.h
authorDinh Nguyen <dinguyen@altera.com>
Fri, 14 Sep 2012 11:08:28 +0000 (11:08 +0000)
committerPrafulla Wadaskar <prafulla@marvell.com>
Wed, 3 Oct 2012 11:13:13 +0000 (16:43 +0530)
include/common.h has the reset_cpu defined already. No need to
re-define here.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Pavel Machek <pavel@denx.de>
Acked-By: Prafulla Wadaskar <Prafulla@marvell.com>
arch/arm/include/asm/arch-kirkwood/cpu.h
arch/arm/include/asm/arch-orion5x/cpu.h

index 23783d543205f2efe5f9148e381852dd32c912be..57bfe8e78b1081ed9e627335ad6e8619d9b93ebd 100644 (file)
@@ -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);
index 2f52ca8407a2d6187ff8d6cd8617551c23f31975..17b9b69be5d86c29c357a63f0348c3ffdeb79712 100644 (file)
@@ -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);