Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / mach-mvebu / timer.c

diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c
index aef2df2f7a07390169c4b56f78081ded9f9ac4ea..f5c2eaa808a3a0ccf7c0fbf22e06a4204d3908df 100644 (file)
--- a/arch/arm/mach-mvebu/timer.c
+++ b/arch/arm/mach-mvebu/timer.c
@@ -31,7 +31,7 @@ int timer_init(void)
        writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x10);
        writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x14);
 
-#if defined(CONFIG_ARMADA_XP)
+#if defined(CONFIG_ARCH_MVEBU)
        /* On Armada XP / 38x ..., the 25MHz clock source needs to be enabled */
        setbits_le32(MVEBU_TIMER_BASE + 0x00, BIT(11));
 #endif