diff options
author | Paolo Bonzini | 2019-07-11 15:14:16 +0200 |
---|---|---|
committer | Paolo Bonzini | 2019-07-11 15:14:16 +0200 |
commit | a45ff5994c9cde41af627c46abb9f32beae68943 (patch) | |
tree | b726cc506ed1b01484f183ab2679cdd618e1e9b1 /sound/sh/aica.c | |
parent | Documentation: virtual: Add toctree hooks (diff) | |
parent | KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register (diff) | |
download | kernel-qcow2-linux-a45ff5994c9cde41af627c46abb9f32beae68943.tar.gz kernel-qcow2-linux-a45ff5994c9cde41af627c46abb9f32beae68943.tar.xz kernel-qcow2-linux-a45ff5994c9cde41af627c46abb9f32beae68943.zip |
Merge tag 'kvm-arm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for 5.3
- Add support for chained PMU counters in guests
- Improve SError handling
- Handle Neoverse N1 erratum #1349291
- Allow side-channel mitigation status to be migrated
- Standardise most AArch64 system register accesses to msr_s/mrs_s
- Fix host MPIDR corruption on 32bit
Diffstat (limited to 'sound/sh/aica.c')
-rw-r--r-- | sound/sh/aica.c | 18 |
1 files changed, 1 insertions, 17 deletions
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> |