Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / include / drm / drm_edid.h

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index c592d2c..9d2d781 100644 (file)
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -122,7 +122,7 @@ struct detailed_data_monitor_range {
                        u8 supported_scalings;
                        u8 preferred_refresh;
                } __attribute__((packed)) cvt;
-       } formula;
+       } __attribute__((packed)) formula;
 } __attribute__((packed));
 
 struct detailed_data_wpindex {
@@ -155,7 +155,7 @@ struct detailed_non_pixel {
                struct detailed_data_wpindex color;
                struct std_timing timings[6];
                struct cvt_timing cvt[4];
-       } data;
+       } __attribute__((packed)) data;
 } __attribute__((packed));
 
 #define EDID_DETAIL_EST_TIMINGS 0xf7
@@ -173,7 +173,7 @@ struct detailed_timing {
        union {
                struct detailed_pixel_timing pixel_data;
                struct detailed_non_pixel other_data;
-       } data;
+       } __attribute__((packed)) data;
 } __attribute__((packed));
 
 #define DRM_EDID_INPUT_SERRATION_VSYNC (1 << 0)