diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-07 07:55:00 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-07 07:55:00 +0200 |
commit | 98b5672c4d474f25227450a29f82f14e84c85f3c (patch) | |
tree | 38f074aca05571b2bed9295e6f83e098c350c94b /include/fb.h | |
parent | 0c5c47b511763a2a9b216918e041178826fbdacc (diff) | |
parent | 427d637327bb4714085ea748bc5e7564ea0acfe6 (diff) | |
download | barebox-98b5672c4d474f25227450a29f82f14e84c85f3c.tar.gz barebox-98b5672c4d474f25227450a29f82f14e84c85f3c.tar.xz |
Merge branch 'for-next/vpl'
Diffstat (limited to 'include/fb.h')
-rw-r--r-- | include/fb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/fb.h b/include/fb.h index d0bab48bdd..311d5db192 100644 --- a/include/fb.h +++ b/include/fb.h @@ -99,6 +99,7 @@ struct display_timings { unsigned int num_modes; struct fb_videomode *modes; + void *edid; }; struct i2c_adapter; @@ -143,6 +144,7 @@ struct fb_info { }; struct display_timings *of_get_display_timings(struct device_node *np); +void display_timings_release(struct display_timings *); int register_framebuffer(struct fb_info *info); |