Merge git://git.denx.de/u-boot-mpc85xx

[u-boot] / arch / powerpc / cpu / mpc83xx / fdt.c

diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index cce7d6b265e6a51cc676f1431aed175180aaba64..f249a585edf140a02278621a84a1519df91f49e0 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -17,8 +17,8 @@ extern void ft_qe_setup(void *blob);
 DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_BOOTCOUNT_LIMIT) && \
-       (defined(CONFIG_QE))
-#include <asm/immap_qe.h>
+       (defined(CONFIG_QE) && !defined(CONFIG_MPC831x))
+#include <linux/immap_qe.h>
 
 void fdt_fixup_muram (void *blob)
 {
@@ -124,7 +124,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 
        fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 
-#if defined(CONFIG_BOOTCOUNT_LIMIT)
+#if defined(CONFIG_BOOTCOUNT_LIMIT) && \
+       (defined(CONFIG_QE) && !defined(CONFIG_MPC831x))
        fdt_fixup_muram (blob);
 #endif
 }