The following commit has been merged in the linux branch: commit d54e9d28241fd52cca3df4f6bc2054a30d453fed Author: Zhenyu Wang zhenyuw@linux.intel.com Date: Mon Oct 19 15:43:51 2009 +0800

drm/i915: quiet DP i2c init

Signed-off-by: Zhenyu Wang zhenyuw@linux.intel.com Signed-off-by: Eric Anholt eric@anholt.net

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f4856a5..d834475 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -400,7 +400,7 @@ intel_dp_i2c_init(struct intel_output *intel_output, const char *name) { struct intel_dp_priv *dp_priv = intel_output->dev_priv;

- DRM_ERROR("i2c_init %s\n", name); + DRM_DEBUG_KMS("i2c_init %s\n", name); dp_priv->algo.running = false; dp_priv->algo.address = 0; dp_priv->algo.aux_ch = intel_dp_i2c_aux_ch;