aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/math-emu/fp_arith.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 07:27:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 07:27:16 +0200
commit23004ec330925e6834c8ddac00e3dd12eb5fb345 (patch)
tree6bcbf18d8a2429e16f842b8a357f439f4f8d3926 /arch/m68k/math-emu/fp_arith.c
parentstaging: mt7621-dma: sizeof via pointer dereference (diff)
parentLinux 5.2-rc3 (diff)
downloadlinux-dev-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.xz
linux-dev-23004ec330925e6834c8ddac00e3dd12eb5fb345.zip
Merge 5.2-rc3 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/math-emu/fp_arith.c')
-rw-r--r--arch/m68k/math-emu/fp_arith.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/math-emu/fp_arith.c b/arch/m68k/math-emu/fp_arith.c
index 239eb1990184..d9033238d097 100644
--- a/arch/m68k/math-emu/fp_arith.c
+++ b/arch/m68k/math-emu/fp_arith.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
fp_arith.c: floating-point math routines for the Linux-m68k
@@ -8,9 +9,6 @@
Somewhat based on the AlphaLinux floating point emulator, by David
Mosberger-Tang.
- You may copy, modify, and redistribute this file under the terms of
- the GNU General Public License, version 2, or any later version, at
- your convenience.
*/
#include "fp_emu.h"