aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/eisa.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
commit341924049558e5f7c1a148a2c461a417933d35d9 (patch)
tree1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/x86/kernel/eisa.c
parenthrtimer: Use a bullet for the returns bullet list (diff)
parentMAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff)
downloadlinux-dev-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz
linux-dev-341924049558e5f7c1a148a2c461a417933d35d9.zip
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/x86/kernel/eisa.c')
-rw-r--r--arch/x86/kernel/eisa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/eisa.c b/arch/x86/kernel/eisa.c
index e8c8c5d78dbd..e963344b0449 100644
--- a/arch/x86/kernel/eisa.c
+++ b/arch/x86/kernel/eisa.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* EISA specific code
- *
- * This file is licensed under the GPL V2
*/
#include <linux/ioport.h>
#include <linux/eisa.h>