summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-03-31 08:43:12 -0400
committerTom Rini <trini@ti.com>2013-03-31 08:43:12 -0400
commit5644369450635fa5c2967bee55b1ac41f6e988d0 (patch)
tree29c272d5a27389635f37171ad142174fb039b0d8 /board
parent1d3dea12e21275eab5af1b50ef4a3be89cfffc15 (diff)
parentd999398822c6d57335677bc4ecc6bea4a569492f (diff)
downloadtalos-obmc-uboot-5644369450635fa5c2967bee55b1ac41f6e988d0.tar.gz
talos-obmc-uboot-5644369450635fa5c2967bee55b1ac41f6e988d0.zip
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'board')
-rw-r--r--board/ait/cam_enc_4xx/cam_enc_4xx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/ait/cam_enc_4xx/cam_enc_4xx.c b/board/ait/cam_enc_4xx/cam_enc_4xx.c
index 32b28f9270..644c445693 100644
--- a/board/ait/cam_enc_4xx/cam_enc_4xx.c
+++ b/board/ait/cam_enc_4xx/cam_enc_4xx.c
@@ -561,7 +561,8 @@ static char *menu_handle(struct menu_display *display)
char *s;
char temp[6][200];
- m = menu_create(display->title, display->timeout, 1, ait_menu_print);
+ m = menu_create(display->title, display->timeout, 1, ait_menu_print,
+ NULL, NULL);
for (i = 0; display->menulist[i]; i++) {
sprintf(key, "%d", i + 1);
OpenPOWER on IntegriCloud