From d8bf342a5d1cec11ba140cc6767b956c89703913 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 11 Jul 2012 12:31:53 +0200
Subject: [PATCH] --- yaml --- r: 318759 b: refs/heads/master c:
 4d678e1670ad3c7240d559c98e481b43342a2974 h: refs/heads/master i:   318757:
 4cd201244d5f5f79ca11701090efcc397a48c3d7   318755:
 1b63cd0835e25cface2a859a5574aa9afab2300b   318751:
 ee0e8790ca63580e67c89cd65b4baa0b907a13b7 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/gpu/drm/i915/intel_drv.h   |  1 -
 trunk/drivers/gpu/drm/i915/intel_modes.c | 28 ------------------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index b51bcc53ac18..be9321a2f83a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2bd1f541f1990dda7dd62f190342c9a964ceb4f
+refs/heads/master: 4d678e1670ad3c7240d559c98e481b43342a2974
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
index 6f3bf22d32f5..84353559441c 100644
--- a/trunk/drivers/gpu/drm/i915/intel_drv.h
+++ b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -342,7 +342,6 @@ struct intel_fbc_work {
 };
 
 int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
-extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus);
 
 extern void intel_attach_force_audio_property(struct drm_connector *connector);
 extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
diff --git a/trunk/drivers/gpu/drm/i915/intel_modes.c b/trunk/drivers/gpu/drm/i915/intel_modes.c
index d67ec3a51e42..45848b9b670b 100644
--- a/trunk/drivers/gpu/drm/i915/intel_modes.c
+++ b/trunk/drivers/gpu/drm/i915/intel_modes.c
@@ -32,34 +32,6 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
-/**
- * intel_ddc_probe
- *
- */
-bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
-{
-	struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-	u8 out_buf[] = { 0x0, 0x0};
-	u8 buf[2];
-	struct i2c_msg msgs[] = {
-		{
-			.addr = DDC_ADDR,
-			.flags = 0,
-			.len = 1,
-			.buf = out_buf,
-		},
-		{
-			.addr = DDC_ADDR,
-			.flags = I2C_M_RD,
-			.len = 1,
-			.buf = buf,
-		}
-	};
-
-	return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
-			    msgs, 2) == 2;
-}
-
 /**
  * intel_ddc_get_modes - get modelist from monitor
  * @connector: DRM connector device to use