The following commit has been merged in the linux branch: commit fb78b11fc2c3743d9a67a226cae8afd06c74d562 Author: Hartley Sweeten hartleys@visionengravers.com Date: Wed Oct 21 02:17:22 2009 +0100

ARM: 5767/1: ep93xx: remove ep93xx_init_time() prototype

Remove unused prototype for ep93xx_init_time(). This function is not defined in the kernel.

Signed-off-by: H Hartley Sweeten hsweeten@visionengravers.com Acked-by: Ryan Mallon ryan@bluewatersys.com Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index a3ec33f..469fd96 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -17,7 +17,6 @@ struct ep93xx_eth_data

void ep93xx_map_io(void); void ep93xx_init_irq(void); -void ep93xx_init_time(unsigned long);

/* EP93xx System Controller software locked register write */ void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg);