diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-23 11:35:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-01 11:59:34 +1000 |
| commit | b26c949755c06ec79e55a75817210083bd78fc9a (patch) | |
| tree | 6ca63a7ca5f6f5130b223b6e4b1ae9606e4e940a | |
| parent | 46fcd2b3dbf58a448b621d3d2f492a0e90223a3a (diff) | |
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: Dave Airlie <airlied@redhat.com>
Cc: stable@kernel.org
| -rw-r--r-- | include/linux/fb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 907ace3a64c8..8e5a9dfb76bf 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -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. */ |