From 643f720cea989d2913fc0120a2384fecc1be1f9a Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sat, 30 Sep 2006 23:27:52 -0700 Subject: [PATCH] [PATCH] mmc (mainly): add "or later" clause to licence statement. Clarify my (Pierre's) position on which GPL versions apply. The patch only touches the source files where I am the only major author. The people who have made the minor commits to the files have been contacted and have no issues with this change. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/i386/kernel/i8237.c | 5 +++++ drivers/mmc/sdhci.c | 5 +++-- drivers/mmc/sdhci.h | 5 +++-- drivers/mmc/wbsd.c | 5 +++-- drivers/mmc/wbsd.h | 5 +++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/arch/i386/kernel/i8237.c b/arch/i386/kernel/i8237.c index c36d1c0..6f508e8 100644 --- a/arch/i386/kernel/i8237.c +++ b/arch/i386/kernel/i8237.c @@ -2,6 +2,11 @@ * i8237.c: 8237A DMA controller suspend functions. * * Written by Pierre Ossman, 2005. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. */ #include diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index fdfc383..4dab5ec 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -4,8 +4,9 @@ * Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. */ #include diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h index f245334..72a6793 100644 --- a/drivers/mmc/sdhci.h +++ b/drivers/mmc/sdhci.h @@ -4,8 +4,9 @@ * Copyright (C) 2005 Pierre Ossman, All Rights Reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. */ /* diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 6435a68..88c6f0b 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -4,8 +4,9 @@ * Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. * * * Warning! diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h index 249baa7..6072993 100644 --- a/drivers/mmc/wbsd.h +++ b/drivers/mmc/wbsd.h @@ -4,8 +4,9 @@ * Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. */ #define LOCK_CODE 0xAA -- 2.7.4