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

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

diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 51f3f4c2203ba6f1d18d3cbe917b76ac614d1aa7..ff89ee554c4125cef0f3012f363806429d6cb1c5 100644 (file)
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008,2010 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -55,6 +55,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
        off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
        if (off < 0)
                printf("%s: %s\n", __FUNCTION__, fdt_strerror(off));
-#endif
+
        ft_fixup_num_cores(blob);
+#endif
 }