| From 4eb47167b82411d4a8e20d7c804fec7b4dcd0163 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Sat, 5 May 2018 21:48:15 -0700 |
| Subject: [PATCH 1264/1795] staging: board: Replace license boilerplate with |
| SPDX identifiers |
| |
| This satisfies a checkpatch.pl warning and is the preferred method for |
| notating the license due to its lack of ambiguity. |
| |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 0a07573c290019b904da76de098e2d1114ea5ba1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/staging/board/armadillo800eva.c | 10 +--------- |
| drivers/staging/board/board.c | 5 +---- |
| 2 files changed, 2 insertions(+), 13 deletions(-) |
| |
| diff --git a/drivers/staging/board/armadillo800eva.c b/drivers/staging/board/armadillo800eva.c |
| index 4de4fd06eebc..962cc0c79988 100644 |
| --- a/drivers/staging/board/armadillo800eva.c |
| +++ b/drivers/staging/board/armadillo800eva.c |
| @@ -1,3 +1,4 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * Staging board support for Armadillo 800 eva. |
| * Enable not-yet-DT-capable devices here. |
| @@ -6,15 +7,6 @@ |
| * |
| * Copyright (C) 2012 Renesas Solutions Corp. |
| * Copyright (C) 2012 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| - * |
| - * 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; version 2 of the License. |
| - * |
| - * 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. |
| */ |
| |
| #include <linux/dma-mapping.h> |
| diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c |
| index 86dc41101610..cb6feb34dd40 100644 |
| --- a/drivers/staging/board/board.c |
| +++ b/drivers/staging/board/board.c |
| @@ -1,10 +1,7 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * Copyright (C) 2014 Magnus Damm |
| * Copyright (C) 2015 Glider bvba |
| - * |
| - * This file is subject to the terms and conditions of the GNU General Public |
| - * License. See the file "COPYING" in the main directory of this archive |
| - * for more details. |
| */ |
| |
| #define pr_fmt(fmt) "board_staging: " fmt |
| -- |
| 2.19.0 |
| |