karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / arch / arm / mach-at91 / spl_atmel.c

diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 8ac53353e62d3a5755611d858995484e78434de3..16277e5150ee8890fca412b5ba4562665e6e907b 100644 (file)
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -51,7 +51,7 @@ static void switch_to_main_crystal_osc(void)
        while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY))
                ;
 
-#ifndef CONFIG_SAMA5D4
+#ifndef CONFIG_SOC_SAMA5D4
        tmp = readl(&pmc->mor);
        tmp &= ~AT91_PMC_MOR_MOSCRCEN;
        tmp &= ~AT91_PMC_MOR_KEY(0xff);