summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/proc.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 /drivers/isdn/gigaset/proc.c
parentstaging: mt7621-dma: sizeof via pointer dereference (diff)
parentLinux 5.2-rc3 (diff)
downloadlinux-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.xz
linux-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 'drivers/isdn/gigaset/proc.c')
-rw-r--r--drivers/isdn/gigaset/proc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index e3f9d0f089fa..8914439a4237 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Stuff used by all variants of the driver
*
@@ -6,10 +7,6 @@
* Tilman Schmidt <tilman@imap.cc>.
*
* =====================================================================
- * 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.
* =====================================================================
*/