From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 24 Jul 2025 12:47:49 +0000 (+0200)
Subject: Merge tag 'asoc-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bca53a176f3d46fdab67f9e2fb1a185e0233d98d;p=thirdparty%2Flinux.git

Merge tag 'asoc-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v6.17

There's a few new drivers here and quite a lot of cleanup work from
Morimoto-san but generally this has been quite a quiet release,
resulting in a fairly small diffstat.  Highlights include:

 - Refactoring of the Kconfig menus to be hopefully more consistant and
   easier to navigate.
 - Refactoring of the DAPM code, mainly hiding functionality that
   doesn't need to be exposed to drivers.
 - Removal of the unused upstream weak paths DAPM functionality.
 - Further work on the generic handling for SoundWire SDCA devices.
 - Cleanups of our usage of the PM autosuspend functions, this pulls in
   some PM core changes on a shared tag.
 - Support for AMD ACP7.2 and SoundWire on ACP 7.1, Fairphone 4 & 5,
   various Intel systems, Qualcomm QCS8275, Richtek RTQ9124 and TI TAS5753.
---

bca53a176f3d46fdab67f9e2fb1a185e0233d98d
diff --cc sound/soc/codecs/hdac_hdmi.c
index b33cd5178008b,3aae0a2eb047a..e50afd0bfcecc
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@@ -24,7 -24,7 +24,6 @@@
  #include <sound/hda_i915.h>
  #include <sound/pcm_drm_eld.h>
  #include <sound/hda_chmap.h>
- #include "hdac_hdmi.h"
 -#include "../../hda/local.h"
  
  #define NAME_SIZE	32