update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / drivers / video / console / fbcon.h

diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index 71c68f2..325ea0e 100644 (file)
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -61,6 +61,19 @@ struct display {
     short yscroll;                  /* Hardware scrolling */
     int vrows;                      /* number of virtual rows */
     int cursor_shape;
+    u32 xres_virtual;
+    u32 yres_virtual;
+    u32 height;
+    u32 width;
+    u32 bits_per_pixel;
+    u32 grayscale;
+    u32 nonstd;
+    u32 accel_flags;
+    struct fb_bitfield red;
+    struct fb_bitfield green;
+    struct fb_bitfield blue;
+    struct fb_bitfield transp;
+    struct fb_videomode *mode;
 };
 
 /* drivers/video/console/fbcon.c */
@@ -84,8 +97,8 @@ extern int set_con2fb_map(int unit, int newidx);
 /* Monochrome */
 #define attr_bold(s) \
        ((s) & 0x200)
-#define attr_reverse(s, inverse) \
-       (((s) & 0x800) ^ (inverse ? 0x800 : 0))
+#define attr_reverse(s) \
+       ((s) & 0x800)
 #define attr_underline(s) \
        ((s) & 0x400)
 #define attr_blink(s) \