diff options
author | 2019-06-09 09:11:21 +0200 | |
---|---|---|
committer | 2019-06-09 09:11:21 +0200 | |
commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /sound/soc/ti/edma-pcm.c | |
parent | VMCI: Fixup atomic64_t abuse (diff) | |
parent | Linux 5.2-rc4 (diff) | |
download | linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/ti/edma-pcm.c')
-rw-r--r-- | sound/soc/ti/edma-pcm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/ti/edma-pcm.c b/sound/soc/ti/edma-pcm.c index fdffb801b185..3ebea1bd15cb 100644 --- a/sound/soc/ti/edma-pcm.c +++ b/sound/soc/ti/edma-pcm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * edma-pcm.c - eDMA PCM driver using dmaengine for AM3xxx, AM4xxx * @@ -6,15 +7,6 @@ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> * * Based on: sound/soc/tegra/tegra_pcm.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. */ #include <linux/module.h> |