Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp8820158rwr; Thu, 11 May 2023 06:42:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4URsk0+hrrJFEUVAOjm7VqiFIxJWhbflfwycUSw/R1bBDDiRxg84jxBKxNgeg6NHSDhkb4 X-Received: by 2002:a05:6a20:4429:b0:f2:ea8e:b130 with SMTP id ce41-20020a056a20442900b000f2ea8eb130mr24391702pzb.62.1683812568564; Thu, 11 May 2023 06:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683812568; cv=none; d=google.com; s=arc-20160816; b=azP7ZSPbp5oeaxWnCHkixGLsXbantvL3g5WabSDj78GRch+hm/zF2O/g8o4DRFijIG QuyTPePZFYlRh4uKK+HXVGtKA4Y4AtAAOm7+2771APvNaSG3viSLAU9Ow+CJI8OlyZHJ GU0T1hKMTDl7OHMQ/Lwk9jVpNWKTYlJ8mSt777Rc4b+yHBBoqpVLSYeWSJ1aBY4EIc9W avSfI9yQIHhafYhsPD+hKCF2SNiG5OcdkKB59ESvqZRodQfipFrwafpyEKkoaWzk41pH C007SZYQDCvUeCQRAWTXDDWCmgQXqQLLojqq5J2AcgasNvrIgjEtci8+ljYO8CHKaPxT Bv+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=asp/vJbfcfKZ1KP4iU5Ob02D7CKXrgn30P/YE4w9l30=; b=niVpJUQBf1vLvfOjRDgUo6aVeAJNsQS5TH7jPw28q/a1jj5vTW942Y6M09Od7yNW5G mb1sJooQNJfRgfE5zWozexIdYTOpUC6s1ECGvtVvslckeq8wWjGcEQIUEnbutEt5O9mq z7vdnBojShogNjtN6mlQoLveg8sxxZk0l/R7154hzDduGDg5orSdVPuoaSMRSbsMf8+T 8oUmbsFI4+j35H/3eK7APFka+yjqla2DOHrwJm44IZmDQlTfipWZGhJ28xwxdHDZvDVL rFZHrJ6A57iuFQzxl/+602X7PXtOelD+rjgc233EXpl73B60nguC/wljwUB1gd97h3c4 Ux9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ofro+aKE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q189-20020a632ac6000000b00517a2ca5ecbsi7044646pgq.692.2023.05.11.06.42.35; Thu, 11 May 2023 06:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ofro+aKE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238219AbjEKNgh (ORCPT + 99 others); Thu, 11 May 2023 09:36:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238119AbjEKNfj (ORCPT ); Thu, 11 May 2023 09:35:39 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47D7911552; Thu, 11 May 2023 06:34:21 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-643aad3bc41so7690816b3a.0; Thu, 11 May 2023 06:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683812060; x=1686404060; 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=asp/vJbfcfKZ1KP4iU5Ob02D7CKXrgn30P/YE4w9l30=; b=Ofro+aKEh9auyIE8HAKilO/Zp/oidJhNsM6hmJt92myPp1QZGjwMTLINfV/un/FG0Q 80+n7G+kj/JcXbuGIx6EeVmK8+siwekMXkynLeos22fTkv1OrvyFxJ+Z2CfbZcQfqUg8 PvmXScoOiu1ogAt8IDoM+e9kclxy/hpWFPk+C9iABhOxlsP9Mf/RKF/DypypQzvKRt6K Cj/FDJi27Y+dvzxK7XHfKcshBghaAD7CGso0rcP6sfOM6rSRAqDB2jlXHzUmcCsI5coe O6hSYcxnKJcykjfOow5HwxXEYb2s65igmajisqhNBTMcq154WfA87cEBGQa5GIVOrdKB xvow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683812060; x=1686404060; 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=asp/vJbfcfKZ1KP4iU5Ob02D7CKXrgn30P/YE4w9l30=; b=cZvAUchI5XSzrHLzIhUL+MdujHRqTRu3ZtNQiTf3bUx1aCmj7AtLi6S5LHiiFW232c PsmClYso3FFCkfivYYZAFGvoaaOd1duiUgYoqfJ/8yIVz1TC9u9IlFQEyGFHI01bJyN1 Nh/MfROqFvmgcyekEtZsvg8oElQBvIauuPvJt3/8mFLCOJtfaRwNXD5Q7H00Xp8e72cl hCKDSR1lpekA2zbAQdQEzhild3xqOMb7ficHZfDrHulRORhGwoZ/AvO4dzZKMCa6UPpS U6OT/ecut8IfIGo7v7zIyZKtT3XnTPCaRSVw9dD23hfobrU16lxFmMaPAY5kM5zzHOn1 PZJg== X-Gm-Message-State: AC+VfDy3kqSqwRDmSxKDmRqf6OXWmbAY+115bRKaky28vy3xh1x3aWve j3qmV+dj4QOBXZZkrBOTb2M= X-Received: by 2002:a05:6a21:6d8e:b0:100:916:d111 with SMTP id wl14-20020a056a216d8e00b001000916d111mr21359146pzb.24.1683812060252; Thu, 11 May 2023 06:34:20 -0700 (PDT) Received: from debian.me (subs02-180-214-232-92.three.co.id. [180.214.232.92]) by smtp.gmail.com with ESMTPSA id x15-20020a056a00270f00b0063f1a27f2c9sm5312910pfv.70.2023.05.11.06.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 06:34:19 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id B02501067DB; Thu, 11 May 2023 20:34:10 +0700 (WIB) From: Bagas Sanjaya To: Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , Tom Rix , Simon Horman , Yang Yingliang , "Steven Rostedt (Google)" , Pavel Machek , Minghao Chi , Kalle Valo , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Viresh Kumar , Arnd Bergmann , Deepak R Varma , Davidlohr Bueso , Thomas Gleixner , Jacob Keller , Gaosheng Cui , Dan Carpenter , Archana , Maxime Bizon , "David A . Hinds" , "John G . Dorsey" Subject: [PATCH 06/10] pcmcia: Add SPDX identifier Date: Thu, 11 May 2023 20:34:02 +0700 Message-Id: <20230511133406.78155-7-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511133406.78155-1-bagasdotme@gmail.com> References: <20230511133406.78155-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=28380; i=bagasdotme@gmail.com; h=from:subject; bh=Q0c6EIp02T5R/jcXdb0xGm7OvcmkESzHeVT6HavlIy8=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkx744rvnpvf7stR7H1sxWjvHoi+4MnaU3N65/1XRG6y tVqx97cUcrCIMbFICumyDIpka/p9C4jkQvtax1h5rAygQxh4OIUgIm8EGFkuP9HcfHUl/ZL2uvV ZOT2zalbbWW5adcsn0pvHm8Xi5zTCxgZnm5asWbFL/2NolIh2s+37dr3bsYxfoFLL20iBPYLZut qsgAA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add SPDX identifier on remaining files untouched during previous rounds of SPDX conversion while replacing boilerplate notice if any. Cc: Maxime Bizon Cc: David A. Hinds Cc: John G. Dorsey Signed-off-by: Bagas Sanjaya --- drivers/pcmcia/bcm63xx_pcmcia.c | 5 +---- drivers/pcmcia/cirrus.h | 21 +-------------------- drivers/pcmcia/i82365.c | 22 +--------------------- drivers/pcmcia/i82365.h | 21 +-------------------- drivers/pcmcia/o2micro.h | 21 +-------------------- drivers/pcmcia/pd6729.c | 3 +-- drivers/pcmcia/pxa2xx_base.h | 1 + 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 +-------------------- 17 files changed, 17 insertions(+), 294 deletions(-) diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index dd3c2609904877..a2808548d55088 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -1,8 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * 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. - * * Copyright (C) 2008 Maxime Bizon */ diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index 446a4576e73e6c..b43689337c4b34 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..c244734c91d227 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/pd6729.c b/drivers/pcmcia/pd6729.c index a0a2e7f18356c5..88be64cc9f5dde 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-1.0-or-later */ /* * Driver for the Cirrus PD6729 PCI-PCMCIA bridge. * * Based on the i82092.c driver. * - * This software may be used and distributed according to the terms of - * the GNU General Public License, incorporated herein by reference. */ #include diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h index e58c7a41541880..9583d08983f5cd 100644 --- a/drivers/pcmcia/pxa2xx_base.h +++ b/drivers/pcmcia/pxa2xx_base.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt); void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops); void pxa2xx_configure_sockets(struct device *dev, struct pcmcia_low_level *ops); 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..5f3cf7229505dd 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..eb52de8a153df5 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..00363df3e41602 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..d93848e0b6e30e 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 -- An old man doll... just what I always wanted! - Clara