summaryrefslogtreecommitdiff
path: root/arch/i386/cpu
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-07-06 17:29:44 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-07-06 17:29:44 +0900
commit2271d3ddccfbd4a7640121669ff9b013b1fea361 (patch)
tree400f22f0a12ff0ae6c472bed6ac648befc1744a2 /arch/i386/cpu
parent25ae8aeb54a6ca89ba1fd11c00865b8fed9348b4 (diff)
parent54841ab50c20d6fa6c9cc3eb826989da3a22d934 (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/i386/cpu')
-rw-r--r--arch/i386/cpu/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/cpu/cpu.c b/arch/i386/cpu/cpu.c
index 3010519e74..bd6aced873 100644
--- a/arch/i386/cpu/cpu.c
+++ b/arch/i386/cpu/cpu.c
@@ -56,7 +56,7 @@ int cpu_init_r(void)
return 0;
}
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
printf ("resetting ...\n");
udelay(50000); /* wait 50 ms */