diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-18 18:43:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-18 18:43:05 +0100 |
commit | 2a8cbf2a02784efc02f7093000010e20c4ebc9ea (patch) | |
tree | 8009bcdbcc7a547089483acc80f2bbb8cb644402 /include | |
parent | Merge tag 'drm-fixes-2019-01-18-1' of git://anongit.freedesktop.org/drm/drm (diff) | |
parent | fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option (diff) | |
download | linux-2a8cbf2a02784efc02f7093000010e20c4ebc9ea.tar.xz linux-2a8cbf2a02784efc02f7093000010e20c4ebc9ea.zip |
Merge tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux
Pull fbdev fixes from Bartlomiej Zolnierkiewicz:
- fix stack memory leak in omap2fb driver (Vlad Tsyrklevich)
- fix OF node name handling v4.20 regression in offb driver (Rob
Herring)
- convert CONFIG_FB_LOGO_CENTER config option added in v5.0-rc1 into a
kernel parameter (Peter Rosin)
* tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux:
fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option
fbdev: offb: Fix OF node name handling
omap2fb: Fix stack memory disclosure
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 7cdd31a69719..f52ef0ad6781 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -653,6 +653,7 @@ extern int fb_new_modelist(struct fb_info *info); extern struct fb_info *registered_fb[FB_MAX]; extern int num_registered_fb; +extern bool fb_center_logo; extern struct class *fb_class; #define for_each_registered_fb(i) \ |