Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index be40dbaed11e06a93eedd67ccff968d7e1aa39fa..3d003805aac32ab1880c432cf556da8c5c29e14c 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -483,7 +483,10 @@ struct fb_info {
 #ifdef CONFIG_FB_TILEBLITTING
        struct fb_tile_ops *tileops;    /* Tile Blitting */
 #endif
-       char __iomem *screen_base;      /* Virtual address */
+       union {
+               char __iomem *screen_base;      /* Virtual address */
+               char *screen_buffer;
+       };
        unsigned long screen_size;      /* Amount of ioremapped VRAM or 0 */ 
        void *pseudo_palette;           /* Fake palette of 16 colors */ 
 #define FBINFO_STATE_RUNNING   0