Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h

Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09

diff --cc libc/kernel/common/linux/fb.h
index 451301c,52648bc..48eec81
mode 100644,100644..100755
--- 1/libc/kernel/common/linux/fb.h
--- 2/libc/kernel/common/linux/fb.h
+++ b/libc/kernel/common/linux/fb.h
@@@ -285,115 -284,117 +290,117 @@@ struct fb_var_screeninfo 
   __u32 sync;
   __u32 vmode;
   __u32 rotate;
 - __u32 colorspace;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-  __u32 reserved[5];
++ __u32 colorspace;
+  __u32 reserved[4];
  };
  struct fb_cmap {
-- __u32 start;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 start;
   __u32 len;
   __u16 *red;
   __u16 *green;
-- __u16 *blue;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u16 *blue;
   __u16 *transp;
  };
  struct fb_con2fbmap {
-- __u32 console;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 console;
   __u32 framebuffer;
  };
  #define VESA_NO_BLANKING 0
--#define VESA_VSYNC_SUSPEND 1
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++#define VESA_VSYNC_SUSPEND 1
  #define VESA_HSYNC_SUSPEND 2
  #define VESA_POWERDOWN 3
  enum {
-- FB_BLANK_UNBLANK = VESA_NO_BLANKING,
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ FB_BLANK_UNBLANK = VESA_NO_BLANKING,
   FB_BLANK_NORMAL = VESA_NO_BLANKING + 1,
   FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1,
   FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1,
-- FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1
  };
  #define FB_VBLANK_VBLANKING 0x001  
  #define FB_VBLANK_HBLANKING 0x002  
--#define FB_VBLANK_HAVE_VBLANK 0x004  
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++#define FB_VBLANK_HAVE_VBLANK 0x004  
  #define FB_VBLANK_HAVE_HBLANK 0x008  
  #define FB_VBLANK_HAVE_COUNT 0x010  
  #define FB_VBLANK_HAVE_VCOUNT 0x020  
--#define FB_VBLANK_HAVE_HCOUNT 0x040  
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++#define FB_VBLANK_HAVE_HCOUNT 0x040  
  #define FB_VBLANK_VSYNCING 0x080  
  #define FB_VBLANK_HAVE_VSYNC 0x100  
  struct fb_vblank {
-- __u32 flags;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 flags;
   __u32 count;
   __u32 vcount;
   __u32 hcount;
-- __u32 reserved[4];
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 reserved[4];
  };
  #define ROP_COPY 0
  #define ROP_XOR 1
--struct fb_copyarea {
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++struct fb_copyarea {
   __u32 dx;
   __u32 dy;
   __u32 width;
-- __u32 height;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 height;
   __u32 sx;
   __u32 sy;
  };
--struct fb_fillrect {
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++struct fb_fillrect {
   __u32 dx;
   __u32 dy;
   __u32 width;
-- __u32 height;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 height;
   __u32 color;
   __u32 rop;
  };
--struct fb_image {
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++struct fb_image {
   __u32 dx;
   __u32 dy;
   __u32 width;
-- __u32 height;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u32 height;
   __u32 fg_color;
   __u32 bg_color;
   __u8 depth;
-- const char *data;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ const char *data;
   struct fb_cmap cmap;
  };
  #define FB_CUR_SETIMAGE 0x01
--#define FB_CUR_SETPOS 0x02
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++#define FB_CUR_SETPOS 0x02
  #define FB_CUR_SETHOT 0x04
  #define FB_CUR_SETCMAP 0x08
  #define FB_CUR_SETSHAPE 0x10
--#define FB_CUR_SETSIZE 0x20
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++#define FB_CUR_SETSIZE 0x20
  #define FB_CUR_SETALL 0xFF
  struct fbcurpos {
   __u16 x, y;
--};
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++};
  struct fb_cursor {
   __u16 set;
   __u16 enable;
-- __u16 rop;
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++ __u16 rop;
   const char *mask;
   struct fbcurpos hot;
   struct fb_image image;
--};
  /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
++};
  #endif
+