karo: cleanup after merge of v2015.10-rc2

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

diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c
index 47e6e5a3cdc4290265b020fdcebab73d06aae9a7..82047f8731b905163056cbff0b392be5a7657fd1 100644 (file)
--- a/arch/arm/mach-at91/mpddrc.c
+++ b/arch/arm/mach-at91/mpddrc.c
@@ -19,7 +19,7 @@ static inline void atmel_mpddr_op(const struct atmel_mpddr *mpddr,
 
 static int ddr2_decodtype_is_seq(u32 cr)
 {
-#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4) || \
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SOC_SAMA5D4) || \
        defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9N12)
        if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED)
                return 0;