From: Dave Airlie Date: Wed, 23 Jun 2010 01:35:41 +0000 (+1000) Subject: fb: fix colliding defines for fb flags. X-Git-Tag: v2.6.32.17~141 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b6961fc8a1350eafe2160ebf86f95053ca6b3c2;p=karo-tx-linux.git fb: fix colliding defines for fb flags. commit b26c949755c06ec79e55a75817210083bd78fc9a upstream. 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/fb.h b/include/linux/fb.h index de9c722e7b90..862e7d4a7820 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -784,8 +784,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 @@ -799,6 +797,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. */