Merge branch 'spi' of git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / arch / powerpc / cpu / mpc83xx / ecc.c

diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 120b37ba63810d14667f199410df7c1db26a8dad..985a024425525637a3b3529ef0cb23da2d197780 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -15,8 +15,8 @@
 void ecc_print_status(void)
 {
        immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
-#ifdef CONFIG_FSL_DDR2
-       ccsr_ddr_t *ddr = &immap->ddr;
+#ifdef CONFIG_SYS_FSL_DDR2
+       struct ccsr_ddr __iomem *ddr = &immap->ddr;
 #else
        ddr83xx_t *ddr = &immap->ddr;
 #endif
@@ -99,8 +99,8 @@ void ecc_print_status(void)
 int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
-#ifdef CONFIG_FSL_DDR2
-       ccsr_ddr_t *ddr = &immap->ddr;
+#ifdef CONFIG_SYS_FSL_DDR2
+       struct ccsr_ddr __iomem *ddr = &immap->ddr;
 #else
        ddr83xx_t *ddr = &immap->ddr;
 #endif