summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-04 08:56:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-04 08:56:57 -0700
commit88b5a850c88a3fd0e9d050d35962259e029e43f4 (patch)
tree6e37e46376110e23dfc1f08cd2f629c0677ec9b3 /include/drm
parentb82207b8e8bffae5b2df8c054a35b0994cbb9896 (diff)
parente4d9e513dedb5ac4e166c1053314fa935ddecc8c (diff)
downloadlinux-88b5a850c88a3fd0e9d050d35962259e029e43f4.tar.gz
linux-88b5a850c88a3fd0e9d050d35962259e029e43f4.tar.bz2
linux-88b5a850c88a3fd0e9d050d35962259e029e43f4.zip
Merge tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "This contains a few fixes for HD-audio: yet another Dell headset pin quirk, a fixup for Thinkpad T540P, and an improved fix for Haswell/Broadwell HDMI clock setup" * tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller drm/i915: provide interface for audio driver to query cdclk ALSA: hda - Add a fixup for Thinkpad T540p ALSA: hda - Add another headset pin quirk for some Dell machines
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/i915_powerwell.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/i915_powerwell.h b/include/drm/i915_powerwell.h
index 2baba9996094..baa6f11b1837 100644
--- a/include/drm/i915_powerwell.h
+++ b/include/drm/i915_powerwell.h
@@ -32,5 +32,6 @@
/* For use by hda_i915 driver */
extern int i915_request_power_well(void);
extern int i915_release_power_well(void);
+extern int i915_get_cdclk_freq(void);
#endif /* _I915_POWERWELL_H_ */