summaryrefslogtreecommitdiffstats
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-05-16 10:47:40 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:47:16 +0200
commitdebf87415579c0f50aab9e0832976d4506babe0f (patch)
treeac35afb7114f29e60954029847a8cd1b43d04f99 /cpu
parent8b251263191ec554967dd1add6237c1ba7f7eb25 (diff)
downloadu-boot-debf87415579c0f50aab9e0832976d4506babe0f.tar.gz
u-boot-debf87415579c0f50aab9e0832976d4506babe0f.tar.xz
u-boot-debf87415579c0f50aab9e0832976d4506babe0f.zip
cpu/mpc512x/diu.c: fix warning: assignment from incompatible pointer type
Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: John Rigby <jcrigby@gmail.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc512x/diu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c
index 6d7e40f0b7..70849ee21b 100644
--- a/cpu/mpc512x/diu.c
+++ b/cpu/mpc512x/diu.c
@@ -95,7 +95,7 @@ int mpc5121_diu_init(void)
bmp = valid_bmp(bmp_env);
}
if (!bmp)
- bmp = FSL_Logo_BMP;
+ bmp = (char *)FSL_Logo_BMP;
return fsl_diu_init(xres, pixel_format, 0, (unsigned char *)bmp);
}