From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Jan 2018 15:54:50 +0000 (+0000)
Subject: Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.16-rc1~43^2~2^5~29
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/498495dba268b20e8eadd7fe93c140c68b6cc9d2

Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
---

498495dba268b20e8eadd7fe93c140c68b6cc9d2
diff --cc sound/soc/intel/skylake/skl-nhlt.c
index bde7f40f29f5,1ce414d86d8a..d9b3dc89a1dc
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@@ -19,8 -19,9 +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,