summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-05 19:34:34 +0000
committerMark Brown <broonie@kernel.org>2015-02-05 19:34:34 +0000
commit542af238080a4faea7c5274475b48aaa2288fbd1 (patch)
tree66fb289e5dc96da22bf750b78c9d95fdab41a9d0 /sound
parent57e6ef38a4a7e4329f185dbd382bcee1da6196a9 (diff)
parent3463667aa171ed5359d63a6195e65d457aa6eb2f (diff)
downloadop-kernel-dev-542af238080a4faea7c5274475b48aaa2288fbd1.zip
op-kernel-dev-542af238080a4faea7c5274475b48aaa2288fbd1.tar.gz
Merge remote-tracking branch 'asoc/fix/rt5640' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rt5640.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index c3f2dec..1ff726c 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2124,6 +2124,7 @@ MODULE_DEVICE_TABLE(of, rt5640_of_match);
static struct acpi_device_id rt5640_acpi_match[] = {
{ "INT33CA", 0 },
{ "10EC5640", 0 },
+ { "10EC5642", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
OpenPOWER on IntegriCloud