From 6c01a1b6a615bed11a5643f714c66baa156d24fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Fri, 14 Apr 2017 09:10:18 +0000 Subject: [PATCH] fix conflicting types --- BaS_gcc/video/fbmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaS_gcc/video/fbmem.c b/BaS_gcc/video/fbmem.c index a33c631..f608d5a 100644 --- a/BaS_gcc/video/fbmem.c +++ b/BaS_gcc/video/fbmem.c @@ -28,7 +28,7 @@ */ -int32_t fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) +int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) { int32_t xoffset = var->xoffset; int32_t yoffset = var->yoffset; @@ -58,7 +58,7 @@ int32_t fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) return 0; } -int32_t fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) +int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) { int32_t err; @@ -91,7 +91,7 @@ int32_t fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) return 0; } -int32_t fb_blank(struct fb_info *info, int32_t blank) +int fb_blank(struct fb_info *info, int blank) { dbg("\r\n"); if (blank > FB_BLANK_POWERDOWN) @@ -99,7 +99,7 @@ int32_t fb_blank(struct fb_info *info, int32_t blank) return(info->fbops->fb_blank(blank, info)); } -int32_t fb_ioctl(struct fb_info *info, uint32_t cmd, uint32_t arg) +int fb_ioctl(struct fb_info *info, uint32_t cmd, uint32_t arg) { struct fb_var_screeninfo var; struct fb_fix_screeninfo fix;