summaryrefslogtreecommitdiffstats
path: root/arch/m68k/cpu/mcf547x_8x
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-22 21:16:17 +0100
committerWolfgang Denk <wd@denx.de>2010-12-22 21:16:17 +0100
commitcdc51c294ad33879c4e57edf4c9d2155381b1d59 (patch)
treefc1c3f2c23a2507e91358a6a6dfa881965bf603f /arch/m68k/cpu/mcf547x_8x
parent250ef029844be2cb98635f265359396866d1749f (diff)
parentb8339e2b9f32663411dba0f48e25b23f542d53bc (diff)
downloadu-boot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.tar.gz
u-boot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.tar.xz
u-boot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.zip
Merge branch 'next' of ../next
Diffstat (limited to 'arch/m68k/cpu/mcf547x_8x')
-rw-r--r--arch/m68k/cpu/mcf547x_8x/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index f9a4b64011..7590f2c1c7 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/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 gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);