From 00aa78eea20645a751db45ae4a46dae15a4576cf Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 6 Nov 2011 10:49:50 +0000 Subject: ARM: restart: iop13xx: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Lennert Buytenhek Signed-off-by: Russell King --- arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-iop13xx/include/mach/iop13xx.h') diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h index 52b7fab7ef6..07e9ff7adaf 100644 --- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h +++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h @@ -10,6 +10,7 @@ void iop13xx_map_io(void); void iop13xx_platform_init(void); void iop13xx_add_tpmi_devices(void); void iop13xx_init_irq(void); +void iop13xx_restart(char, const char *); /* CPUID CP6 R0 Page 0 */ static inline int iop13xx_cpu_id(void) -- cgit v1.2.3 From 6f71e9213c1dd31c44824e95ea4441883fceaf9c Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Sun, 11 Mar 2012 15:21:39 -0500 Subject: ARM: iop13xx: fix missing declaration of iop13xx_init_early Commit 1dfe34ae794c13 (ARM: iop13xx: use runtime ioremap hook) missed a declaration of iop13xx_init_early resulting in a build error. Signed-off-by: Rob Herring --- arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-iop13xx/include/mach/iop13xx.h') diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h index 07e9ff7adaf..e190dcd7d72 100644 --- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h +++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h @@ -5,6 +5,7 @@ /* The ATU offsets can change based on the strapping */ extern u32 iop13xx_atux_pmmr_offset; extern u32 iop13xx_atue_pmmr_offset; +void iop13xx_init_early(void); void iop13xx_init_irq(void); void iop13xx_map_io(void); void iop13xx_platform_init(void); -- cgit v1.2.3