diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 13:39:34 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 13:39:34 +0200 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /sound/soc/ti/ams-delta.c | |
parent | ASoC: soc-core: don't use soc_find_component() at snd_soc_find_dai() (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.xz linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'sound/soc/ti/ams-delta.c')
-rw-r--r-- | sound/soc/ti/ams-delta.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index 50ca3c42642f..dee8fc70a64f 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * ams-delta.c -- SoC audio for Amstrad E3 (Delta) videophone * @@ -5,21 +6,6 @@ * * Initially based on sound/soc/omap/osk5912.x * Copyright (C) 2008 Mistral Solutions - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * */ #include <linux/gpio/consumer.h> |