diff options
author | Chris Wilson | 2010-09-21 12:19:32 +0200 |
---|---|---|
committer | Chris Wilson | 2010-09-21 12:19:32 +0200 |
commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/gpu/drm/i915/intel_hdmi.c | |
parent | drm/i915: use GMBUS to manage i2c links (diff) | |
parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
download | kernel-qcow2-linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.tar.gz kernel-qcow2-linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.tar.xz kernel-qcow2-linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.zip |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index f814cb035e01..9fb9501f2d07 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -146,7 +146,7 @@ static bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, } static enum drm_connector_status -intel_hdmi_detect(struct drm_connector *connector) +intel_hdmi_detect(struct drm_connector *connector, bool force) { struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); struct drm_i915_private *dev_priv = connector->dev->dev_private; |