Skip to contentSkip to conversation

Add "or later" clause to licence statement.

PATCH New Pierre Ossman 1 participant 1 message Sep 24, 2006 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 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(-)
arch/i386/kernel/i8237.c +5 -0
index c36d1c0..6f508e8 100644
@@ -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 <linux/init.h>
drivers/mmc/sdhci.c +3 -2
index 4e21b3b..835dc1f 100644
@@ -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 <linux/delay.h>
drivers/mmc/sdhci.h +3 -2
index f245334..72a6793 100644
@@ -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.
  */
 
 /*
drivers/mmc/wbsd.c +3 -2
index c351c6d..eb67075 100644
@@ -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!
drivers/mmc/wbsd.h +3 -2
index 249baa7..6072993 100644
@@ -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