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

[u-boot] / board / Marvell / sheevaplug / sheevaplug.c

diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index d7dc80c1ba2980792cc1a720ab36c22d7d752422..688d3086d4d3f3296b82e4e45a464788f2f92619 100644 (file)
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <miiphy.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
 #include "sheevaplug.h"
@@ -95,7 +96,7 @@ int board_early_init_f(void)
                MPP49_GPIO,
                0
        };
-       kirkwood_mpp_conf(kwmpp_config);
+       kirkwood_mpp_conf(kwmpp_config, NULL);
        return 0;
 }