Signed-off-by: Diederik de Haas <[email protected]>
---
drivers/pcmcia/sa11xx_base.c | 4 ++--
drivers/pcmcia/sa11xx_base.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 48140ac73ed6..514f3c2cb467 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -18,8 +18,8 @@
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
+ 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
diff --git a/drivers/pcmcia/sa11xx_base.h b/drivers/pcmcia/sa11xx_base.h
index 3d76d720f463..955f1fff2645 100644
--- a/drivers/pcmcia/sa11xx_base.h
+++ b/drivers/pcmcia/sa11xx_base.h
@@ -18,8 +18,8 @@
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
+ 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
--
2.39.0
On Sunday, 22 January 2023 19:31:17 CET Diederik de Haas wrote:
> 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
> + terms of the GNU General Public License version 2 (the "GPL"), in
> + which case the provisions of the GPL are applicable instead of the
Please disregard this patch.
I was wrong to initially see this as a spelling error and I now see that my
change would actually change the license, which I can't do (afaik).
It might be seen as a reasonable assumption that the GNU *General* Public
License was meant, when it comes to legal/license material, one should not do
that.
See https://lore.kernel.org/lkml/2281101.Yu7Ql3qPJb@prancing-pony/ for details
Apologies for the noise.
Diederik