summaryrefslogtreecommitdiffstats
path: root/include/gui/gui.h
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-08-06 12:33:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-08-06 12:33:06 +0200
commit3c92473a9e24a55c9e253027178492a788ea7611 (patch)
treeb2e1f67265e4651cab0251afa7d7e7b2a0c16d27 /include/gui/gui.h
parentebd6f26412cdc5c123ece13c5df1bf5077dc0633 (diff)
parent27f79c05ab4256007ae5096452c543c2bf5f2347 (diff)
downloadbarebox-3c92473a9e24a55c9e253027178492a788ea7611.tar.gz
barebox-3c92473a9e24a55c9e253027178492a788ea7611.tar.xz
Merge branch 'for-next/fbcon'
Diffstat (limited to 'include/gui/gui.h')
-rw-r--r--include/gui/gui.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gui/gui.h b/include/gui/gui.h
index 829d156842..03e60aa0de 100644
--- a/include/gui/gui.h
+++ b/include/gui/gui.h
@@ -18,7 +18,7 @@ struct surface {
struct screen {
int fd;
- struct fb_info info;
+ struct fb_info *info;
struct surface s;
@@ -27,7 +27,7 @@ struct screen {
int fbsize;
};
-static inline void* gui_screen_redering_buffer(struct screen *sc)
+static inline void *gui_screen_render_buffer(struct screen *sc)
{
if (sc->offscreenbuf)
return sc->offscreenbuf;