Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b26c9497 authored by Dave Airlie's avatar Dave Airlie
Browse files

fb: fix colliding defines for fb flags. 



When I added the flags I must have been using a 25 line terminal and missed the following flags.

The collided with flag has one user in staging despite being in-tree for 5 years.

I'm happy to push this via my drm tree unless someone really wants to do it.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Cc: stable@kernel.org
parent 46fcd2b3

include/linux/fb.h

+2 −2
Original line number Diff line number Diff line
@@ -786,8 +786,6 @@ struct fb_tile_ops { 
#define FBINFO_MISC_USEREVENT          0x10000 /* event request

						  from userspace */

#define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */

#define FBINFO_MISC_FIRMWARE           0x40000 /* a replaceable firmware

						  inited framebuffer */



/* A driver may set this flag to indicate that it does want a set_par to be

 * called every time when fbcon_switch is executed. The advantage is that with
@@ -801,6 +799,8 @@ struct fb_tile_ops { 
 */

#define FBINFO_MISC_ALWAYS_SETPAR   0x40000



/* where the fb is a firmware driver, and can be replaced with a proper one */

#define FBINFO_MISC_FIRMWARE        0x80000

/*

 * Host and GPU endianness differ.

 */