Replace unversioned GPL boilerplate notice on remaining i825xx files with appropriate SPDX identifier. For files that contains "extension to Linux kernel", use GPL 2.0, otherwise GPL 1.0+. Cc: Donald Becker <becker@xxxxxxxxx> Cc: Michael Hipp <hippm@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Cc: Richard Hirst <richard@xxxxxxxxxxxxxxxxxxx> Cc: Sam Creasey <sammy@xxxxxxxxx> Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx> Signed-off-by: Bagas Sanjaya <bagasdotme@xxxxxxxxx> --- drivers/net/ethernet/i825xx/82596.c | 5 ++--- drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++--- drivers/net/ethernet/i825xx/lib82596.c | 5 ++--- drivers/net/ethernet/i825xx/sun3_82586.c | 4 +--- drivers/net/ethernet/i825xx/sun3_82586.h | 4 +--- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c index 3ee89ae496d0ca..773d7aa29ef5fc 100644 --- a/drivers/net/ethernet/i825xx/82596.c +++ b/drivers/net/ethernet/i825xx/82596.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* 82596.c: A generic 82596 ethernet driver for linux. */ /* Based on Apricot.c @@ -31,9 +32,7 @@ Driver skeleton Written 1993 by Donald Becker. Copyright 1993 United States Government as represented by the Director, - National Security Agency. This software may only be used and distributed - according to the terms of the GNU General Public License as modified by SRC, - incorporated herein by reference. + National Security Agency. The author may be reached as becker@xxxxxxxxx, or C/O Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403 diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c index 0af70094aba341..3e53e0c243ba04 100644 --- a/drivers/net/ethernet/i825xx/lasi_82596.c +++ b/drivers/net/ethernet/i825xx/lasi_82596.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as munged into HPPA boxen . @@ -59,9 +60,7 @@ Driver skeleton Written 1993 by Donald Becker. Copyright 1993 United States Government as represented by the Director, - National Security Agency. This software may only be used and distributed - according to the terms of the GNU General Public License as modified by SRC, - incorporated herein by reference. + National Security Agency. The author may be reached as becker@xxxxxxxxx, or C/O Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403 diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c index ca2fb303fcc6f6..67d248a7a6f49e 100644 --- a/drivers/net/ethernet/i825xx/lib82596.c +++ b/drivers/net/ethernet/i825xx/lib82596.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as munged into HPPA boxen . @@ -59,9 +60,7 @@ Driver skeleton Written 1993 by Donald Becker. Copyright 1993 United States Government as represented by the Director, - National Security Agency. This software may only be used and distributed - according to the terms of the GNU General Public License as modified by SRC, - incorporated herein by reference. + National Security Agency. The author may be reached as becker@xxxxxxxxx, or C/O Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403 diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c index 3909c6a0af89f9..f05f016cb3b0ea 100644 --- a/drivers/net/ethernet/i825xx/sun3_82586.c +++ b/drivers/net/ethernet/i825xx/sun3_82586.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Sun3 i82586 Ethernet driver * @@ -8,9 +9,6 @@ * * net-3-driver for the NI5210 card (i82586 Ethernet chip) * - * This is an extension to the Linux operating system, and is covered by the - * same Gnu Public License that covers that work. - * * Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later) * Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@xxxxxxxxxxxxxxxxxxxxxxxxxxx) * -------------------------- diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h index d82eca563266a1..82702b32c61fec 100644 --- a/drivers/net/ethernet/i825xx/sun3_82586.h +++ b/drivers/net/ethernet/i825xx/sun3_82586.h @@ -1,9 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Intel i82586 Ethernet definitions * - * This is an extension to the Linux operating system, and is covered by the - * same Gnu Public License that covers that work. - * * copyrights (c) 1994 by Michael Hipp (hippm@xxxxxxxxxxxxxxxxxxxxxxxxxxx) * * I have done a look in the following sources: -- An old man doll... just what I always wanted! - Clara