Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

[thirdparty/kernel/stable.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8cdafef8eac9d9578008bbeb33e935aca3e65dd8..655d146e1126560a865d52dd29514e4037c036e6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1139,7 +1139,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
        if (IS_GEN5(dev_priv))
                intel_gpu_ips_init(dev_priv);
 
-       i915_audio_component_init(dev_priv);
+       intel_audio_init(dev_priv);
 
        /*
         * Some ports require correctly set-up hpd registers for detection to
@@ -1157,7 +1157,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 {
-       i915_audio_component_cleanup(dev_priv);
+       intel_audio_deinit(dev_priv);
 
        intel_gpu_ips_teardown();
        acpi_video_unregister();