diff options
| author | Chris Wilson | 2010-12-03 00:36:21 +0100 |
|---|---|---|
| committer | Chris Wilson | 2010-12-03 00:50:36 +0100 |
| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | drm/i915: Kill the get_fence tracepoint (diff) | |
| parent | drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI. (diff) | |
| download | kernel-qcow2-linux-b9e68670cc3a13166b389ce847af19b0d0d33c67.tar.gz kernel-qcow2-linux-b9e68670cc3a13166b389ce847af19b0d0d33c67.tar.xz kernel-qcow2-linux-b9e68670cc3a13166b389ce847af19b0d0d33c67.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5154e315300d..7273c9e7e0dc 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -238,7 +238,7 @@ extern void intel_dvo_init(struct drm_device *dev); extern void intel_tv_init(struct drm_device *dev); extern void intel_mark_busy(struct drm_device *dev, struct drm_i915_gem_object *obj); -extern void intel_lvds_init(struct drm_device *dev); +extern bool intel_lvds_init(struct drm_device *dev); extern void intel_dp_init(struct drm_device *dev, int dp_reg); void intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, |