a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fb: fix colliding defines for fb flags.

Browse Source 
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: Dave Airlie <airlied@redhat.com>
Cc: stable@kernel.org
This commit is contained in:
Dave Airlie 2010-06-23 11:35:41 +10:00
parent 46fcd2b3db
commit b26c949755
1 changed files with 2 additions and 2 deletions

4
include/linux/fb.h
View File

@ -786,8 +786,6 @@ struct fb_tile_ops {
#define FBINFO_MISC_USEREVENT 0x10000 /* event request #define FBINFO_MISC_USEREVENT 0x10000 /* event request
from userspace */ from userspace */
#define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ #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 /* 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 * 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 #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. * Host and GPU endianness differ.
*/ */