diff --git a/include/nuttx/video/edid.h b/include/nuttx/video/edid.h
index 26fbea84173..fec2add6c3d 100644
--- a/include/nuttx/video/edid.h
+++ b/include/nuttx/video/edid.h
@@ -500,12 +500,13 @@
  * Pre-processor Definitions
  ********************************************************************************************/
 
-/* This structure represents one video mode extracted from the EDID */
+/* This structure represents one video mode extracted from the EDID.  CAREFUL:  Fields
+ * may not change without also modification to initializer in edid_videomode.c.
+ */
 
 struct edid_videomode_s
 {
   uint32_t dotclock;     /* Dot clock frequency in kHz. */
-  uint16_t flags;        /* Video mode flags; see above. */
   uint16_t hdisplay;
   uint16_t hsync_start;
   uint16_t hsync_end;
@@ -514,8 +515,8 @@ struct edid_videomode_s
   uint16_t vsync_start;
   uint16_t vsync_end;
   uint16_t vtotal;
+  uint16_t flags;        /* Video mode flags; see above. */
   FAR const char *name;
-  int hskew;
 };
 
 /* These structures is a user-friendly digest of the EDID data. */
diff --git a/video/edid/edid_videomode.c b/video/edid/edid_videomode.c
index b485e2e8e8b..dc944e659ed 100644
--- a/video/edid/edid_videomode.c
+++ b/video/edid/edid_videomode.c
@@ -65,7 +65,7 @@
 
 #define M(nm,hr,vr,clk,hs,he,ht,vs,ve,vt,f) \
   { \
-    clk, hr, hs, he, ht, vr, vs, ve, vt, f, nm, 0 \
+    clk, hr, hs, he, ht, vr, vs, ve, vt, f, nm \
   }
 
 /****************************************************************************