From: Hartley Sweeten Date: Tue, 23 Feb 2010 20:20:31 +0000 (+0100) Subject: ARM: 5953/1: ep93xx: fix broken build of clock.c X-Git-Tag: v2.6.34-rc1~241^2~4^4~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba7c6a3bccd25abd3c19d3655ecb1cc4d258271b;p=karo-tx-linux.git ARM: 5953/1: ep93xx: fix broken build of clock.c Patch 5879/1: ep93xx: define magic numbers for pll1 and pll2 broke the ep93xx build due to one missing rename of EP93XX_SYSCON_CLOCK_SET2. The correct name should be EP93XX_SYSCON_CLKSET2. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King --- diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 27e335131799..49fa9f8fef4a 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -463,7 +463,7 @@ static int __init ep93xx_clock_init(void) ep93xx_dma_clock_init(); /* Determine the bootloader configured pll2 rate */ - value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2); + value = __raw_readl(EP93XX_SYSCON_CLKSET2); if (!(value & EP93XX_SYSCON_CLKSET2_NBYP2)) clk_pll2.rate = clk_xtali.rate; else if (value & EP93XX_SYSCON_CLKSET2_PLL2_EN)