davinci_emac: compilation fix, phy is array now

[u-boot] / drivers / mmc / atmel_mci.c

diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c
index 40282563209524ab0d428d4288473078798b1307..0af8d42611cfa5af2dd379f4135c8043e257152a 100644 (file)
--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@@ -28,7 +28,7 @@
 #include <asm/errno.h>
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #include "atmel_mci.h"
 
@@ -463,7 +463,7 @@ static void mci_set_data_timeout(struct mmc_csd *csd)
               dtocyc << shift, dtor);
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
        struct mmc_cid cid;
        struct mmc_csd csd;