diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:25:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:25:25 +0300 |
| commit | 119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch) | |
| tree | 40d834b32ce97857f3f974c95b64b6b48d415e6e /sound/sh | |
| parent | 086ebf92aa791b6cc8805decffca7b8898d99a4e (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.tar.xz | |
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/sh')
| -rw-r--r-- | sound/sh/Kconfig | 1 | ||||
| -rw-r--r-- | sound/sh/Makefile | 1 | ||||
| -rw-r--r-- | sound/sh/aica.c | 18 | ||||
| -rw-r--r-- | sound/sh/sh_dac_audio.c | 17 |
4 files changed, 4 insertions, 33 deletions
diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig index 61139f3c1614..b75fbb3236a7 100644 --- a/sound/sh/Kconfig +++ b/sound/sh/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # ALSA SH drivers menuconfig SND_SUPERH diff --git a/sound/sh/Makefile b/sound/sh/Makefile index 7d09b5188cf7..c0bbc500c17c 100644 --- a/sound/sh/Makefile +++ b/sound/sh/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for ALSA # diff --git a/sound/sh/aica.c b/sound/sh/aica.c index a24e486d9d83..52e9cfb4f819 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -1,27 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* This code is licenced under -* the General Public Licence -* version 2 * * Copyright Adrian McMenamin 2005, 2006, 2007 * <adrian@mcmen.demon.co.uk> * Requires firmware (BSD licenced) available from: * http://linuxdc.cvs.sourceforge.net/linuxdc/linux-sh-dc/sound/oss/aica/firmware/ * or the maintainer -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of version 2 of the GNU General Public License 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* */ #include <linux/init.h> diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c index 834b2574786f..ed877a138965 100644 --- a/sound/sh/sh_dac_audio.c +++ b/sound/sh/sh_dac_audio.c @@ -1,25 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sh_dac_audio.c - SuperH DAC audio driver for ALSA * * Copyright (c) 2009 by Rafael Ignacio Zurita <rizurita@yahoo.com> * - * * Based on sh_dac_audio.c (Copyright (C) 2004, 2005 by Andriy Skulysh) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include <linux/hrtimer.h> |