From patchwork Wed May 17 06:13:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13244242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2E9BC77B7D for ; Wed, 17 May 2023 06:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BxT18jMEkzFqPYZMlk0XJi5NKwf741NkRRRUyiaV1KE=; b=oZSODLNFr9AOIz dSg4KKrjbHZRXg0zwIQ1QeVtSsn/UaRv4MrCpB5paxiH8u3AvSYQmp0kqauTb1ZuaRAvs/awL4T3l W//t4YuvMGURHS19mCI1be9zZLNCVHpIBQ7oHCGtE9fU3vchxnsyjQ1WNn+8tuHvLWKiFSNxqCweN DopCpVzFexatFdxM0VEqAsv+Kq68Ssh5VR9WHZdh5dfttqAPE/NsmYmv5teLKh6RTND8zpm43Q+hp YMtJ7dQ7q+73NKgvWM1H6n94au1jl/q+c8OfvJMI8lzqYU86jtncgKaGKgNHdcmdGsp0UEV4zXUUH PCk3fsZZOsn6lIYsttmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pzAQ9-008Nfl-2Z; Wed, 17 May 2023 06:13:57 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzAQ2-008NaE-07 for linux-arm-kernel@lists.infradead.org; Wed, 17 May 2023 06:13:54 +0000 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64ab2a37812so10711413b3a.1 for ; Tue, 16 May 2023 23:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684304027; x=1686896027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F3lK/82RAw0QZEjsD4BXXHLsrrmmKA6HV/X8St2HKgs=; b=OhLxxOXpQKk2kNHQZnXE6iJxnSJQN1KFsyIKtTbPnMHsXJyiPGMlH1uTnc5lUVT9dh IZQ049SGiQeKWaqfjgaozVAannN4fHmEZUIXOahtXSJDy//vxfYm/N+pyOHFEKAf6KIs 0JU4cNAOMf/b/ogtB4RHtf/RUdgf3Th5Ut3a+4iyu8SaDsrDogpVzkVqrhYPyQRLw6aQ N9PvAYidkRnSeaz5SFk4pfoJ9VEPBqm7/nf/8OTayEunmc3/+VOmXTIu9R/FMNd+h4bb P30P7bh+e39i5XPwR5ye7c3P0CawFqQal1y722v4yxpnWKf29ruTsvutrqibiNSJRSUo 2YbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684304027; x=1686896027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F3lK/82RAw0QZEjsD4BXXHLsrrmmKA6HV/X8St2HKgs=; b=MMXZKwKUbb4nJUW6/oapksNOjfEl/vOiDzYA7eUdSXDjDAPrI3MVF0I+ZWg3r+I82O g5hPu4lnTl3IkoBZ6pzcQPe2XPvxAcgg6Nuae/V6hKxPFVsYKMMz12e9ccwix0FfqYXN 9PmSS3EJXAAE6nmKyCxKS4ovQa6+QT/PxCIKCWnyguY614dGNCYAaowBkZACGBk3Vlkt DeJDWJJWqU2XN91hgn0ieRvyCWjM5EfD7mMQ/QAEvgD3AxELIJIPrRCAOR3ueFBhQdoF r01eJYNjUFgjc3yQsqZN8EmqJAjB0OLg5QqYQ5C02wGpRswi0O8PieuhyIPTazew4D8y JMyg== X-Gm-Message-State: AC+VfDw0zCOQE57bR/gl+OdkfH3BVcADTcOfT3QdzUaN3YiH9LgORUSP Lmhq94Y3VOGaCWkvddvt85M= X-Google-Smtp-Source: ACHHUZ7WtNgiXnk/vGT8nQQ5vMU22HsO6X9krOFcCa8CKuwtDItxe/OmOItc2vIjiEptc9Z4PpuoJg== X-Received: by 2002:a17:902:f693:b0:1ac:788c:872a with SMTP id l19-20020a170902f69300b001ac788c872amr1582837plg.1.1684304026699; Tue, 16 May 2023 23:13:46 -0700 (PDT) Received: from debian.me (subs02-180-214-232-16.three.co.id. [180.214.232.16]) by smtp.gmail.com with ESMTPSA id u16-20020a17090adb5000b0023d0c2f39f2sm690827pjx.19.2023.05.16.23.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 23:13:45 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id CEE6F1061C6; Wed, 17 May 2023 13:13:41 +0700 (WIB) From: Bagas Sanjaya To: Linux Kernel Mailing List , Linux ARM Cc: Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Bagas Sanjaya , Paolo Abeni , Minghao Chi , "Steven Rostedt (Google)" , Pavel Machek , Kalle Valo , Arnd Bergmann , Linus Walleij , Viresh Kumar , Lee Jones , Greg Kroah-Hartman , =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , "David A . Hinds" , "John G . Dorsey" Subject: [PATCH 1/3] pcmcia: Convert dual GPL/MPL notice to SPDX license identifier Date: Wed, 17 May 2023 13:13:36 +0700 Message-Id: <20230517061338.1081810-2-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230517061338.1081810-1-bagasdotme@gmail.com> References: <20230517061338.1081810-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=26656; i=bagasdotme@gmail.com; h=from:subject; bh=Cn8UOAilwZdQvO1z/7cE78weTQTUVch9kzUAoTFKYb0=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkpBRPb3CfFXbKQydurYjJPiXfS5MxJCitu+m1jzonhT +TcFR3cUcrCIMbFICumyDIpka/p9C4jkQvtax1h5rAygQxh4OIUgIk4nWX4p8dX9Uno57/ehPWf xTvePIivLHooxCt1I2Jin7L7h+79sYwMx1ckzsrJMhLr3tJaHM5sNet64QvVU/NNreuUDj7bUza ZFwA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230516_231350_080450_EA3343FC X-CRM114-Status: GOOD ( 20.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace license boilerplate for dual GPL 2.0/MPL 1.1 with corresponding SPDX license identifier. Cc: David A. Hinds Cc: John G. Dorsey Signed-off-by: Bagas Sanjaya Acked-by: Linus Walleij --- drivers/pcmcia/cirrus.h | 21 +-------------------- drivers/pcmcia/i82365.c | 22 +--------------------- drivers/pcmcia/i82365.h | 21 +-------------------- drivers/pcmcia/o2micro.h | 21 +-------------------- drivers/pcmcia/ricoh.h | 21 +-------------------- drivers/pcmcia/sa1100_generic.c | 22 +--------------------- drivers/pcmcia/sa11xx_base.c | 22 +--------------------- drivers/pcmcia/sa11xx_base.h | 22 +--------------------- drivers/pcmcia/soc_common.c | 22 +--------------------- drivers/pcmcia/tcic.c | 22 +--------------------- drivers/pcmcia/tcic.h | 21 +-------------------- drivers/pcmcia/ti113x.h | 21 +-------------------- drivers/pcmcia/topic.h | 23 +---------------------- drivers/pcmcia/vg468.h | 21 +-------------------- 14 files changed, 14 insertions(+), 288 deletions(-) diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index 446a4576e73e6c..8d3a256c97a087 100644 --- a/drivers/pcmcia/cirrus.h +++ b/drivers/pcmcia/cirrus.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * cirrus.h 1.4 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_CIRRUS_H diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index 891ccea2cccb0a..a7b50c7201215f 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c @@ -1,34 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for Intel 82365 and compatible PC Card controllers. i82365.c 1.265 1999/11/10 18:36:21 - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is David A. Hinds . Portions created by David A. Hinds are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU General Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/i82365.h b/drivers/pcmcia/i82365.h index 3f84d7a2dc84fa..5501001c7dd8ab 100644 --- a/drivers/pcmcia/i82365.h +++ b/drivers/pcmcia/i82365.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * i82365.h 1.15 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_I82365_H diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 5096e92c7a4cfb..8b828c0932950c 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * o2micro.h 1.13 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_O2MICRO_H diff --git a/drivers/pcmcia/ricoh.h b/drivers/pcmcia/ricoh.h index 8ac7b138c09486..f037169f6108f7 100644 --- a/drivers/pcmcia/ricoh.h +++ b/drivers/pcmcia/ricoh.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * ricoh.h 1.9 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_RICOH_H diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 89d4ba58c89135..9ec190ab29a89e 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 48140ac73ed632..3e9b3b0c9b0817 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/sa11xx_base.h b/drivers/pcmcia/sa11xx_base.h index 3d76d720f463de..c2dbdc5495f78e 100644 --- a/drivers/pcmcia/sa11xx_base.h +++ b/drivers/pcmcia/sa11xx_base.h @@ -1,33 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #if !defined(_PCMCIA_SA1100_H) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 61b0c8952bb5e0..8b035367fd4268 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Common support code for the PCMCIA control functionality of integrated SOCs like the SA-11x0 and PXA2xx microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c index 1a0e3f0987599d..a5fca2d14c1257 100644 --- a/drivers/pcmcia/tcic.c +++ b/drivers/pcmcia/tcic.c @@ -1,34 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for Databook TCIC-2 PCMCIA controller tcic.c 1.111 2000/02/15 04:13:12 - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is David A. Hinds . Portions created by David A. Hinds are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU General Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/tcic.h b/drivers/pcmcia/tcic.h index 2c0b8f65ad6c6f..aff1e65fc69032 100644 --- a/drivers/pcmcia/tcic.h +++ b/drivers/pcmcia/tcic.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * tcic.h 1.13 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_TCIC_H diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index 5cb670e037a0c6..a65ab56551ee93 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * ti113x.h 1.16 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_TI113X_H diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h index 582688fe750540..d1ad01abab13f4 100644 --- a/drivers/pcmcia/topic.h +++ b/drivers/pcmcia/topic.h @@ -1,31 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * topic.h 1.8 1999/08/28 04:01:47 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. - * topic.h $Release$ 1999/08/28 04:01:47 */ #ifndef _LINUX_TOPIC_H diff --git a/drivers/pcmcia/vg468.h b/drivers/pcmcia/vg468.h index 88c2b487f675fc..c582fc8086c26d 100644 --- a/drivers/pcmcia/vg468.h +++ b/drivers/pcmcia/vg468.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * vg468.h 1.11 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_VG468_H