summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/atom
diff options
context:
space:
mode:
authorMark Brown2016-11-04 19:33:45 +0100
committerMark Brown2016-11-04 19:33:45 +0100
commit56eba7a15bbd239b56e2586012501df7b9d201cc (patch)
tree5083bcec6e0f0f04d675ee291e145dd3bbee31f2 /sound/soc/intel/atom
parentLinux 4.9-rc3 (diff)
parentASoC: Intel: Skylake: Fix to turn off hdmi power on probe failure (diff)
downloadkernel-qcow2-linux-56eba7a15bbd239b56e2586012501df7b9d201cc.tar.gz
kernel-qcow2-linux-56eba7a15bbd239b56e2586012501df7b9d201cc.tar.xz
kernel-qcow2-linux-56eba7a15bbd239b56e2586012501df7b9d201cc.zip
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/intel/atom')
-rw-r--r--sound/soc/intel/atom/sst/sst_acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index ba5c0d71720a..0a88537ca58a 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -416,6 +416,7 @@ static const struct dmi_system_id cht_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
},
},
+ { }
};