summaryrefslogtreecommitdiff
path: root/drivers/net/fddi/skfp/h/mbuf.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2019-06-19 15:18:48 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2019-06-19 15:18:48 +0200
commit2ee692802b8f6c54bd6499addd3d07c2833d84d8 (patch)
tree6aa9a7de774804de0d5a944436a380eb99a6ac68 /drivers/net/fddi/skfp/h/mbuf.h
parent0f5a5712ad1e3b8472b1c1459681dadad9277067 (diff)
parent1dcff4ae65185e8c0300972f6d8d39d9a9db2bda (diff)
downloadlwn-2ee692802b8f6c54bd6499addd3d07c2833d84d8.tar.gz
lwn-2ee692802b8f6c54bd6499addd3d07c2833d84d8.zip
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers: - remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking - assorted locking checks in vt/console code - assorted notifier and cleanups in fbdev and backlight code One trivial merge conflict fixed. Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/net/fddi/skfp/h/mbuf.h')
-rw-r--r--drivers/net/fddi/skfp/h/mbuf.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/fddi/skfp/h/mbuf.h b/drivers/net/fddi/skfp/h/mbuf.h
index f2aadcda9e7f..e456dcca1879 100644
--- a/drivers/net/fddi/skfp/h/mbuf.h
+++ b/drivers/net/fddi/skfp/h/mbuf.h
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/******************************************************************************
*
* (C)Copyright 1998,1999 SysKonnect,
* a business unit of Schneider & Koch & Co. Datensysteme GmbH.
*
- * 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.
- *
* The information in this file is provided "AS IS" without warranty.
*
******************************************************************************/