From: Mark Brown <broonie@kernel.org>
Date: Tue, 5 Jan 2016 18:06:29 +0000 (+0000)
Subject: Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1;p=linux-beck.git

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

ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1
diff --cc sound/soc/intel/skylake/skl.c
index c38bf99ced10,caa69c4598a6..b69649aa7809
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -25,8 -25,8 +25,9 @@@
  #include <linux/pci.h>
  #include <linux/pm_runtime.h>
  #include <linux/platform_device.h>
+ #include <linux/firmware.h>
  #include <sound/pcm.h>
 +#include "../common/sst-acpi.h"
  #include "skl.h"
  
  /*
diff --cc sound/soc/intel/skylake/skl.h
index 3d167eed0f59,a0709e344d44..36a1b8c5f6d0
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@@ -68,10 -67,9 +68,11 @@@ struct skl 
  
  	struct skl_dsp_resource resource;
  	struct list_head ppl_list;
- 
+ 	struct list_head dapm_path_list;
 -
 +	const char *fw_name;
+ 	const struct firmware *tplg;
 +
 +	int supend_active;
  };
  
  #define skl_to_ebus(s)	(&(s)->ebus)