From 8820ecc040f2b2392de20f32ee40cb5f3b90d0d3 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" <pfg@FreeBSD.org> Date: Thu, 30 Nov 2017 15:10:11 +0000 Subject: SPDX: Fix some cases wrongly attributed to MIT. In the cases of BSD-style license variants without clauses, use 0BSD for the time being in lack of a better description. --- sys/netpfil/pf/if_pfsync.c | 2 +- sys/sparc64/pci/sbbc.c | 2 +- sys/sys/gpio.h | 2 +- sys/sys/msg.h | 2 +- sys/sys/snoop.h | 2 +- sys/x86/isa/isa.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index d6bdc25acf95..2c3930de225c 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 2002 Michael Shalayeff * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org> diff --git a/sys/sparc64/pci/sbbc.c b/sys/sparc64/pci/sbbc.c index 90ed258464ce..dd6b42841ef2 100644 --- a/sys/sparc64/pci/sbbc.c +++ b/sys/sparc64/pci/sbbc.c @@ -1,6 +1,6 @@ /* $OpenBSD: sbbc.c,v 1.7 2009/11/09 17:53:39 nicm Exp $ */ /*- - * SPDX-License-Identifier: MIT AND BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: (ISC AND BSD-2-Clause-FreeBSD) * * Copyright (c) 2008 Mark Kettenis * diff --git a/sys/sys/gpio.h b/sys/sys/gpio.h index 0d8c3eb5b1d1..2505269de64d 100644 --- a/sys/sys/gpio.h +++ b/sys/sys/gpio.h @@ -1,7 +1,7 @@ /* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */ /* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org> * All rights reserved. diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 36a5c8d8277f..5c9cdfe47d0c 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -4,7 +4,7 @@ /*- * SVID compatible msg.h file * - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Author: Daniel Boulet * diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h index 483cccf43b34..d999750df3ef 100644 --- a/sys/sys/snoop.h +++ b/sys/sys/snoop.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: 0BSD * * Copyright (c) 1995 Ugen J.S.Antsilevich * diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c index e3edc0923425..7a98a2bf9ed8 100644 --- a/sys/x86/isa/isa.c +++ b/sys/x86/isa/isa.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT + * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC) * * Copyright (c) 1998 Doug Rabson * All rights reserved. -- cgit v1.2.3