diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
| commit | fc0e23fad33198fc7d74227dba7bbc3a5d7755aa (patch) | |
| tree | 669319e33fb63a456986b6ac41cf3b584f583caf /drivers/gpu/drm/i915/intel_drv.h | |
| parent | af677166cf63c179dc2485053166e02c4aea01eb (diff) | |
| parent | 3bb9eca913025ed05c0510de831c67b7bef652c5 (diff) | |
| download | linux-fc0e23fad33198fc7d74227dba7bbc3a5d7755aa.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 03a2112004f9..ba2323f1b92b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1196,6 +1196,8 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, void intel_audio_codec_disable(struct intel_encoder *encoder); void i915_audio_component_init(struct drm_i915_private *dev_priv); void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); +void intel_audio_init(struct drm_i915_private *dev_priv); +void intel_audio_deinit(struct drm_i915_private *dev_priv); /* intel_display.c */ enum transcoder intel_crtc_pch_transcoder(struct intel_crtc *crtc); |