summaryrefslogtreecommitdiff
path: root/sound/arm/pxa2xx-ac97-lib.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-03 11:50:21 +0300
committerThomas Gleixner <tglx@linutronix.de>2019-07-03 11:50:21 +0300
commit341924049558e5f7c1a148a2c461a417933d35d9 (patch)
tree1340b4f2131737ef4be63f18ee74cd73ad12cd3e /sound/arm/pxa2xx-ac97-lib.c
parent516337048fa40496ae5ca9863c367ec991a44d9a (diff)
parent4a8f81b8c053aad250ee247b219904ada72df9a4 (diff)
downloadlinux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
-rw-r--r--sound/arm/pxa2xx-ac97-lib.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 8eafd3d3dff6..58274b4a1f09 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Based on sound/arm/pxa2xx-ac97.c and sound/soc/pxa/pxa2xx-ac97.c
* which contain:
@@ -5,10 +6,6 @@
* Author: Nicolas Pitre
* Created: Dec 02, 2004
* Copyright: MontaVista Software Inc.
- *
- * 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.
*/
#include <linux/kernel.h>