From: Anatolij Gustschin Date: Tue, 16 Mar 2010 16:10:08 +0000 (+0100) Subject: mpc5121: cpu/mpc512x/diu.c: fix warnings X-Git-Tag: v2010.03-rc2~5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=51c2ac9bb574c1420b993615268392b0c1f829f6;p=u-boot mpc5121: cpu/mpc512x/diu.c: fix warnings Fix warnings while compiling with CONFIG_VIDEO enabled: diu.c: In function 'video_hw_init': diu.c:158: warning: 'return' with no value, in function returning non-void diu.c:162: warning: format '%ld' expects type 'long int', but argument 6 has type 'int' diu.c:162: warning: format '%ld' expects type 'long int', but argument 7 has type 'int' Signed-off-by: Anatolij Gustschin --- diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c index a24f39510e..ca459a101e 100644 --- a/cpu/mpc512x/diu.c +++ b/cpu/mpc512x/diu.c @@ -145,10 +145,10 @@ void *video_hw_init(void) struct fb_info *info; if (mpc5121_diu_init() < 0) - return; + return NULL; /* fill in Graphic device struct */ - sprintf(pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", + sprintf(pGD->modeIdent, "%dx%dx%d %dkHz %dHz", xres, yres, 32, 64, 60); pGD->frameAdrs = (unsigned int)fsl_fb_open(&info);