diff options
author | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:15 +0100 |
commit | 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a (patch) | |
tree | 23c64d19f8d321a501f9e3567befc527c0fe1d55 /sound/hda | |
parent | a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (diff) | |
parent | a6b675a89e51a1cdad0481b809b7840d3f86e4b5 (diff) | |
download | linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.tar.gz linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.tar.bz2 linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.zip |
Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus
Diffstat (limited to 'sound/hda')
-rw-r--r-- | sound/hda/intel-nhlt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c index 99a23fe7fab9..73d4f8c4f4c7 100644 --- a/sound/hda/intel-nhlt.c +++ b/sound/hda/intel-nhlt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // Copyright (c) 2015-2019 Intel Corporation #include <linux/acpi.h> |