From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 2 Dec 2010 23:36:21 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9e68670cc3a13166b389ce847af19b0d0d33c67;p=linux-beck.git

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/intel_drv.h
---

b9e68670cc3a13166b389ce847af19b0d0d33c67
diff --cc drivers/gpu/drm/i915/intel_drv.h
index 5154e315300d,e52c6125bb1f..7273c9e7e0dc
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -236,9 -236,8 +236,9 @@@ void intel_dip_infoframe_csum(struct di
  extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
  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_gem_object *obj);
 +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,