Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index 67e2f4632a24..8e5c83b2d120 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -23,6 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/fb.h>
 #include "drmP.h"
@@ -33,7 +34,7 @@
  * intel_ddc_probe
  *
  */
-bool intel_ddc_probe(struct intel_output *intel_output)
+bool intel_ddc_probe(struct intel_encoder *intel_encoder)
 {
         u8 out_buf[] = { 0x0, 0x0};
         u8 buf[2];
@@ -53,9 +54,9 @@ bool intel_ddc_probe(struct intel_output *intel_output)
                 }
         };
 
-        intel_i2c_quirk_set(intel_output->base.dev, true);
-        ret = i2c_transfer(intel_output->ddc_bus, msgs, 2);
-        intel_i2c_quirk_set(intel_output->base.dev, false);
+        intel_i2c_quirk_set(intel_encoder->base.dev, true);
+        ret = i2c_transfer(intel_encoder->ddc_bus, msgs, 2);
+        intel_i2c_quirk_set(intel_encoder->base.dev, false);
         if (ret == 2)
                 return true;
 
@@ -68,19 +69,19 @@ bool intel_ddc_probe(struct intel_output *intel_output)
  *
  * Fetch the EDID information from @connector using the DDC bus.
  */
-int intel_ddc_get_modes(struct intel_output *intel_output)
+int intel_ddc_get_modes(struct intel_encoder *intel_encoder)
 {
         struct edid *edid;
         int ret = 0;
 
-        intel_i2c_quirk_set(intel_output->base.dev, true);
-        edid = drm_get_edid(&intel_output->base, intel_output->ddc_bus);
-        intel_i2c_quirk_set(intel_output->base.dev, false);
+        intel_i2c_quirk_set(intel_encoder->base.dev, true);
+        edid = drm_get_edid(&intel_encoder->base, intel_encoder->ddc_bus);
+        intel_i2c_quirk_set(intel_encoder->base.dev, false);
         if (edid) {
-                drm_mode_connector_update_edid_property(&intel_output->base,
+                drm_mode_connector_update_edid_property(&intel_encoder->base,
                                                         edid);
-                ret = drm_add_edid_modes(&intel_output->base, edid);
-                intel_output->base.display_info.raw_edid = NULL;
+                ret = drm_add_edid_modes(&intel_encoder->base, edid);
+                intel_encoder->base.display_info.raw_edid = NULL;
                 kfree(edid);
         }