Merge tag 'v3.7-rc2' into drm-intel-next-queued

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_modes.c

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index 29b72593fbb276fbce8b2ae00828cc7c48a06bf3..cabd84bf66ebd576e1f75cdc8e4ef8a7f928e073 100644 (file)
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -27,8 +27,8 @@
 #include <linux/i2c.h>
 #include <linux/fb.h>
 #include <drm/drm_edid.h>
-#include "drmP.h"
-#include "drm_edid.h"
+#include <drm/drmP.h>
+#include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include "i915_drv.h"
 
@@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector,
        drm_mode_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
        drm_edid_to_eld(connector, edid);
-       connector->display_info.raw_edid = NULL;
        kfree(edid);
 
        return ret;