diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/nfc/pn544/pn544.h | |
| parent | 324e8f5f5d9d4d0b9a608b2fdb88cd93b0fbb12a (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz | |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc/pn544/pn544.h')
| -rw-r--r-- | drivers/nfc/pn544/pn544.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/nfc/pn544/pn544.h b/drivers/nfc/pn544/pn544.h index 2aa9233e8086..5634ba215ead 100644 --- a/drivers/nfc/pn544/pn544.h +++ b/drivers/nfc/pn544/pn544.h @@ -1,18 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 - 2012 Intel Corporation. All rights reserved. - * - * 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. - * - * 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/>. */ #ifndef __LOCAL_PN544_H_ |