Condense these updates down to SPDX tags too while doing this. This is a port of a1452a3771c4eb85bd779790b040efdc36f4274e from the Linux Kernel.

Signed-off-by: Tom Rini trini@konsulko.com --- include/linux/mtd/concat.h | 5 +++-- include/linux/mtd/doc2000.h | 11 ++++++----- include/linux/mtd/mtd.h | 2 +- include/linux/mtd/nand_ecc.h | 8 ++++---- 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h index 195a4a5..a374ca9 100644 --- a/include/linux/mtd/concat.h +++ b/include/linux/mtd/concat.h @@ -1,9 +1,10 @@ /* * MTD device concatenation layer definitions * - * (C) 2002 Robert Kaiser rkaiser@sysgo.de + * Copyright © 2002 Robert Kaiser rkaiser@sysgo.de + * + * SPDX-License-Identifier: GPL-2.0+ * - * This code is GPL */

#ifndef MTD_CONCAT_H diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h index ba29d53..a3cfe6b 100644 --- a/include/linux/mtd/doc2000.h +++ b/include/linux/mtd/doc2000.h @@ -1,12 +1,13 @@ /* * Linux driver for Disk-On-Chip devices * - * Copyright (C) 1999 Machine Vision Holdings, Inc. - * Copyright (C) 2001-2003 David Woodhouse dwmw2@infradead.org - * Copyright (C) 2002-2003 Greg Ungerer gerg@snapgear.com - * Copyright (C) 2002-2003 SnapGear Inc + * Copyright © 1999 Machine Vision Holdings, Inc. + * Copyright © 1999-2010 David Woodhouse dwmw2@infradead.org + * Copyright © 2002-2003 Greg Ungerer gerg@snapgear.com + * Copyright © 2002-2003 SnapGear Inc + * + * SPDX-License-Identifier: GPL-2.0+ * - * Released under GPL */

#ifndef __MTD_DOC2000_H__ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index bc4d9bf8f..c8bca4d 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -1,7 +1,7 @@ /* * Copyright © 1999-2010 David Woodhouse dwmw2@infradead.org et al. * - * Released under GPL + * SPDX-License-Identifier: GPL-2.0+ * */

diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h index 090da50..02ba9f7 100644 --- a/include/linux/mtd/nand_ecc.h +++ b/include/linux/mtd/nand_ecc.h @@ -1,11 +1,11 @@ /* * drivers/mtd/nand_ecc.h * - * Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com) + * Copyright (C) 2000-2010 Steven J. Hill sjhill@realitydiluted.com + * David Woodhouse dwmw2@infradead.org + * Thomas Gleixner tglx@linutronix.de * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0 * * This file is the header for the ECC algorithm. */