
5 Nov
2009
5 Nov
'09
1:03 a.m.
The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should not be including the immap_83xx.h when building 85xx.
Signed-off-by: Kumar Gala galak@kernel.crashing.org --- nand_spl/nand_boot_fsl_elbc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c index 7f14a6f..1d79f11 100644 --- a/nand_spl/nand_boot_fsl_elbc.c +++ b/nand_spl/nand_boot_fsl_elbc.c @@ -25,7 +25,12 @@
#include <common.h> #include <asm/io.h> +#ifdef CONFIG_MPC83xx #include <asm/immap_83xx.h> +#endif +#ifdef CONFIG_MPC85xx +#include <asm/immap_85xx.h> +#endif #include <asm/fsl_lbc.h> #include <linux/mtd/nand.h>
--
1.6.0.6