| Message ID | 1318972342-3801-1-git-send-email-daniel.schwierzeck@googlemail.com |
|---|---|
| State | Accepted |
| Commit | 3668d8fa0417a3082aa57dd5e0db8fbe887c31e0 |
| Headers | show |
Dear Daniel Schwierzeck, In message <1318972342-3801-1-git-send-email-daniel.schwierzeck@googlemail.com> you wrote: > In commit fa28bd2eef588ec2048ccafedb2b384d5a355858 patch v1 was applied > instead of v2. This is an incremental patch to update that commit > to version 2. > > Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> > --- > changes for v2: > use correct type cast > > changes for v3: > rebased against current master > incremental patch from v1 to v2 > > one checkpatch.pl warning: > WARNING: line over 80 characters > #38: FILE: common/command.c:483: > + (int (*)(int, char * const [], char, int, char * []))addr; > > common/command.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/common/command.c b/common/command.c index 2c0bf53..c5cecd3 100644 --- a/common/command.c +++ b/common/command.c @@ -479,7 +479,8 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size) #ifdef CONFIG_AUTO_COMPLETE if (cmdtp->complete) { addr = (ulong)(cmdtp->complete) + gd->reloc_off; - cmdtp->complete = (char *)addr; + cmdtp->complete = + (int (*)(int, char * const [], char, int, char * []))addr; } #endif cmdtp++;
In commit fa28bd2eef588ec2048ccafedb2b384d5a355858 patch v1 was applied instead of v2. This is an incremental patch to update that commit to version 2. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> --- changes for v2: use correct type cast changes for v3: rebased against current master incremental patch from v1 to v2 one checkpatch.pl warning: WARNING: line over 80 characters #38: FILE: common/command.c:483: + (int (*)(int, char * const [], char, int, char * []))addr; common/command.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)