summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-06 20:53:28 +0100
committerTakashi Iwai <tiwai@suse.de>2016-01-06 20:53:28 +0100
commit3f37b26f8d57756b591383a9d8ce1cd628bc773c (patch)
tree0311f4c48cfa7ace3940f3db203b930a2c2eaaa5 /sound/soc/intel/skylake/skl.h
parentc7b60a89516beb20a352ec85c73a8fccd5becf26 (diff)
parentbc42f363da213b4bf7c15a2dc87b2b1a85cde867 (diff)
downloadlinux-3f37b26f8d57756b591383a9d8ce1cd628bc773c.tar.bz2
Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute fixes for v4.4 A few final fixes for v4.4, the main one being the two patches to the new Sky Lake drivers which fix a previous incorrect fix that went in during an earlier -rc.
Diffstat (limited to 'sound/soc/intel/skylake/skl.h')
-rw-r--r--sound/soc/intel/skylake/skl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index dd2e79ae45a8..a0709e344d44 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -68,6 +68,8 @@ struct skl {
struct skl_dsp_resource resource;
struct list_head ppl_list;
struct list_head dapm_path_list;
+
+ const struct firmware *tplg;
};
#define skl_to_ebus(s) (&(s)->ebus)