From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Jan 2018 12:43:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7e9a8a878552d58d1bd5e71ca6feadfed99421d2;p=linux.git

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
---

7e9a8a878552d58d1bd5e71ca6feadfed99421d2
diff --cc sound/soc/intel/skylake/skl-nhlt.c
index 26b0a5caea5ab,bde7f40f29f5c..3b1d2b828c1b6
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@@ -19,9 -19,8 +19,10 @@@
   */
  #include <linux/pci.h>
  #include "skl.h"
+ #include "skl-i2s.h"
  
 +#define NHLT_ACPI_HEADER_SIG	"NHLT"
 +
  /* Unique identification for getting NHLT blobs */
  static guid_t osc_guid =
  	GUID_INIT(0xA69F886E, 0x6CEB, 0x4594,