fb: fix colliding defines for fb flags.
PATCH 1/1 fb: fix colliding defines for fb flags.
From: Dave Airlie <[email protected]>
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.
--- include/linux/fb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/fb.h +2 -2
@@ -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. */
Signature · 1 line
1.7.1
Quoted 7 lines
From: Dave Airlie <[email protected]>
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.
Quoted 7 lines
I'm happy to push this via my drm tree unless someone really wants to do it.
Signed-off-by Dave Airlie <[email protected]>--- include/linux/fb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 30 lines
include/linux/fb.h +2
-2@@ -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. */ Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines
From: Dave Airlie <[email protected]>
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.
Quoted 7 lines
I'm happy to push this via my drm tree unless someone really wants to do it.
Signed-off-by Dave Airlie <[email protected]>--- include/linux/fb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 30 lines
include/linux/fb.h +2
-2@@ -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. */ Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
--