diff options
| author |  Mark Brown <broonie@kernel.org>
| 2023-08-10 00:19:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org>
| 2023-08-10 00:19:02 +0100 |
| commit | 81113108491edc277d61337ea410c5f89d85faa3 (patch) | |
| tree | 2bce8a3c2bd7ad8bd46674cd34ddde5ba1073417 /sound/soc/fsl | |
| parent | ASoC: cs35l56: Bugfixes (diff) | |
| parent | ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier (diff) | |
| download | linux-81113108491edc277d61337ea410c5f89d85faa3.tar.gz linux-81113108491edc277d61337ea410c5f89d85faa3.tar.bz2 linux-81113108491edc277d61337ea410c5f89d85faa3.zip | |
ASoC: Merge up fixes
For the benefit of CI
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_micfil.c | 4 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_micfil.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index b07c27c780d9..bbaad6ec2e72 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause // Copyright 2018 NXP #include <linux/bitfield.h> @@ -1318,4 +1318,4 @@ module_platform_driver(fsl_micfil_driver); MODULE_AUTHOR("Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>"); MODULE_DESCRIPTION("NXP PDM Microphone Interface (MICFIL) driver"); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h index 231a52aff024..c6b902ba0a53 100644 --- a/sound/soc/fsl/fsl_micfil.h +++ b/sound/soc/fsl/fsl_micfil.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* * PDM Microphone Interface for the NXP i.MX SoC * Copyright 2018 NXP |