Subject: Re: linux-next: build failure after merge of the sound-asoc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 26 Apr 2022 20:49:24 +1000

Hi Amadeusz,

On Tue, 26 Apr 2022 11:01:18 +0200 Amadeusz Sławiński         <[email-masked]> wrote:
>
> > I have applied the following patch for today:
> > 
> > From: Stephen Rothwell <[email-masked]>
> > Date: Tue, 26 Apr 2022 17:49:37 +1000
> > Subject: [PATCH] fixup for "ASoC: Intel: avs: Configure modules according to their type"
> > 
> > Signed-off-by: Stephen Rothwell <[email-masked]>
> > ---
> >   sound/soc/intel/avs/path.c | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
> > index 3d46dd5e5bc4..6f47ac44de87 100644
> > --- a/sound/soc/intel/avs/path.c
> > +++ b/sound/soc/intel/avs/path.c
> > @@ -9,6 +9,7 @@
> >   #include <sound/intel-nhlt.h>
> >   #include <sound/pcm_params.h>
> >   #include <sound/soc.h>
> > +#include <sound/intel-nhlt.h>  
> 
> This fix seems weird, as same include is 3 lines earlier?

Right.  I applied this at the same time as the previous fix which
probably stopped this file from being built.  The real problem is that
the structure is not defined for !CONFIG_ACPI.

So this fix is not needed.

Sorry for the noise.
-- 
Cheers,
Stephen Rothwell