From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Simmons Date: Wed, 23 Jun 2010 15:58:06 +0000 Subject: Re: [PATCH] fb: fix colliding defines for fb flags. Message-Id: List-Id: References: <1277257612-8491-1-git-send-email-airlied@gmail.com> In-Reply-To: <1277257612-8491-1-git-send-email-airlied@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dave Airlie Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, Dave Airlie , stable@kernel.org > From: Dave Airlie > > 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 > Cc: stable@kernel.org > --- > include/linux/fb.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: James Simmons > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 907ace3..8e5a9df 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. > */ > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >