From a3ab5f07008d9fb4946b3863db604957c0c5144b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 23 Jun 2010 11:35:41 +1000 Subject: [PATCH] --- yaml --- r: 200728 b: refs/heads/master c: b26c949755c06ec79e55a75817210083bd78fc9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fb.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f926f75f11e..6277c4e54d9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46fcd2b3dbf58a448b621d3d2f492a0e90223a3a +refs/heads/master: b26c949755c06ec79e55a75817210083bd78fc9a diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h index 907ace3a64c8..8e5a9dfb76bf 100644 --- a/trunk/include/linux/fb.h +++ b/trunk/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. */