diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
| commit | 7824a88b4286980512de2a46763646100274a5ac (patch) | |
| tree | fc10f5509fa12f85b72ba14c9bdf62641278f303 /include/linux/fb.h | |
| parent | 25591b66d0a4f9277241cebe1a74b4f985bc27a9 (diff) | |
| parent | caacbdc28f545744770fb2caf347b3c4be9a6299 (diff) | |
Merge drm/drm-next into drm-intel-next
Backmerge to sync up with drm-intel-gt-next and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index c14576458228..94e2c44c6569 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -591,8 +591,6 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf, /* fbmem.c */ extern int register_framebuffer(struct fb_info *fb_info); extern void unregister_framebuffer(struct fb_info *fb_info); -extern int fb_prepare_logo(struct fb_info *fb_info, int rotate); -extern int fb_show_logo(struct fb_info *fb_info, int rotate); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height, u32 shift_high, u32 shift_low, u32 mod); @@ -603,9 +601,6 @@ extern int fb_get_color_depth(struct fb_var_screeninfo *var, extern int fb_get_options(const char *name, char **option); extern int fb_new_modelist(struct fb_info *info); -extern bool fb_center_logo; -extern int fb_logo_count; - static inline void lock_fb_info(struct fb_info *info) { mutex_lock(&info->lock); |