diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 |
| commit | cdc51c294ad33879c4e57edf4c9d2155381b1d59 (patch) | |
| tree | fc1c3f2c23a2507e91358a6a6dfa881965bf603f /board/funkwerk/vovpn-gw | |
| parent | 250ef029844be2cb98635f265359396866d1749f (diff) | |
| parent | b8339e2b9f32663411dba0f48e25b23f542d53bc (diff) | |
| download | u-boot-cdc51c294ad33879c4e57edf4c9d2155381b1d59.tar.gz | |
Merge branch 'next' of ../next
Diffstat (limited to 'board/funkwerk/vovpn-gw')
| -rw-r--r-- | board/funkwerk/vovpn-gw/vovpn-gw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index e856adaee5..a4bfbc9780 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -306,7 +306,7 @@ int misc_init_r (void) #if defined(CONFIG_HAVE_OWN_RESET) int -do_reset (void *cmdtp, int flag, int argc, char * const argv[]) +do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { volatile ioport_t *iop; |