lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[039/140] fb: fix colliding defines for fb flags.
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Dave Airlie <airlied@redhat.com>

    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 <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    include/linux/fb.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/linux/fb.h
    +++ b/include/linux/fb.h
    @@ -785,8 +785,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
    @@ -800,6 +798,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.
    */



    \
     
     \ /
      Last update: 2010-07-30 19:37    [W:0.024 / U:2.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site