From: Keith Packard <keithp@keithp.com>
Date: Thu, 20 Oct 2011 21:10:43 +0000 (-0700)
Subject: Merge branch 'fix-pch-refclk' into foo
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a1f57808afd65b1d066d5e1907526a1e45215df;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'fix-pch-refclk' into foo
---

9a1f57808afd65b1d066d5e1907526a1e45215df
diff --cc drivers/gpu/drm/i915/i915_drv.h
index b2ac20287f3b,98f2e0bf80de..0e777fdf9c61
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1301,10 -1302,11 +1302,11 @@@ extern int intel_modeset_vga_set_state(
  extern bool intel_fbc_enabled(struct drm_device *dev);
  extern void intel_disable_fbc(struct drm_device *dev);
  extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
+ extern void ironlake_init_pch_refclk(struct drm_device *dev);
  extern void ironlake_enable_rc6(struct drm_device *dev);
  extern void gen6_set_rps(struct drm_device *dev, u8 val);
 -extern void intel_detect_pch (struct drm_device *dev);
 -extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
 +extern void intel_detect_pch(struct drm_device *dev);
 +extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);
  
  /* overlay */
  #ifdef CONFIG_DEBUG_FS