Merge branch 'asoc-4.20' into asoc-linus

This commit is contained in:
Mark Brown
2018-12-18 12:23:57 +00:00
5 changed files with 38 additions and 15 deletions

View File

@@ -1246,6 +1246,7 @@ MODULE_DEVICE_TABLE(of, rt5660_of_match);
static const struct acpi_device_id rt5660_acpi_match[] = {
{ "10EC5660", 0 },
{ "10EC3277", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match);