releases/2.6.32.17/fb-fix-colliding-defines-for-fb-flags.patch

   1 From b26c949755c06ec79e55a75817210083bd78fc9a Mon Sep 17 00:00:00 2001
   2 From: Dave Airlie <airlied@redhat.com>
   3 Date: Wed, 23 Jun 2010 11:35:41 +1000
   4 Subject: fb: fix colliding defines for fb flags.
   5
   6 From: Dave Airlie <airlied@redhat.com>
   7
   8 commit b26c949755c06ec79e55a75817210083bd78fc9a upstream.
   9
  10 When I added the flags I must have been using a 25 line terminal and missed the following flags.
  11
  12 The collided with flag has one user in staging despite being in-tree for 5 years.
  13
  14 I'm happy to push this via my drm tree unless someone really wants to do it.
  15
  16 Signed-off-by: Dave Airlie <airlied@redhat.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18
  19 ---
  20  include/linux/fb.h |    4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 --- a/include/linux/fb.h
  24 +++ b/include/linux/fb.h
  25 @@ -784,8 +784,6 @@ struct fb_tile_ops {
  26  #define FBINFO_MISC_USEREVENT          0x10000 /* event request
  27                                                   from userspace */
  28  #define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */
  29 -#define FBINFO_MISC_FIRMWARE           0x40000 /* a replaceable firmware
  30 -                                                 inited framebuffer */
  31
  32  /* A driver may set this flag to indicate that it does want a set_par to be
  33   * called every time when fbcon_switch is executed. The advantage is that with
  34 @@ -799,6 +797,8 @@ struct fb_tile_ops {
  35   */
  36  #define FBINFO_MISC_ALWAYS_SETPAR   0x40000
  37
  38 +/* where the fb is a firmware driver, and can be replaced with a proper one */
  39 +#define FBINFO_MISC_FIRMWARE        0x80000
  40  /*
  41   * Host and GPU endianness differ.
  42   */