diff options
author | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
---|---|---|
committer | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
commit | 23da766ab1dc005860b675bf048226a11a748bf9 (patch) | |
tree | 3f8dbfc2cf68f5da3faa3a377087b06dd8ad343d /drivers/nfc/nxp-nci/firmware.c | |
parent | sched/fair: Remove sgs->sum_weighted_load (diff) | |
parent | Linux 5.2-rc5 (diff) | |
download | kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.gz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.xz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.zip |
Merge tag 'v5.2-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nfc/nxp-nci/firmware.c')
-rw-r--r-- | drivers/nfc/nxp-nci/firmware.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c index e50c6f67bb39..dae0c8030e95 100644 --- a/drivers/nfc/nxp-nci/firmware.c +++ b/drivers/nfc/nxp-nci/firmware.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Generic driver for NXP NCI NFC chips * @@ -7,18 +8,6 @@ * * Derived from PN544 device driver: * Copyright (C) 2012 Intel Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/completion.h> |