On Thu, Aug 29, 2019 at 04:20:12PM +1000, Stephen Rothwell wrote: > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Thu, 29 Aug 2019 16:08:49 +1000 > Subject: [PATCH] ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > sound/soc/intel/common/soc-intel-quirks.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h > index e6357d306cb8..863a477d3405 100644 > --- a/sound/soc/intel/common/soc-intel-quirks.h > +++ b/sound/soc/intel/common/soc-intel-quirks.h > @@ -36,7 +36,7 @@ SOC_INTEL_IS_CPU(byt, INTEL_FAM6_ATOM_SILVERMONT); > SOC_INTEL_IS_CPU(cht, INTEL_FAM6_ATOM_AIRMONT); > SOC_INTEL_IS_CPU(apl, INTEL_FAM6_ATOM_GOLDMONT); > SOC_INTEL_IS_CPU(glk, INTEL_FAM6_ATOM_GOLDMONT_PLUS); > -SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE); > +SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_L); ARGHH... rebase again?
