Merge branch 'master' of ../master into next

[u-boot] / arch / m68k / cpu / mcf523x / cpu.c

diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 582aec9b23e5646caea05543de055cb8717ed49a..2376f970da71ed4a31d95465934efc06c7f5d0aa 100644 (file)
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -34,7 +34,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile ccm_t *ccm = (ccm_t *) MMAP_CCM;