diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2006-09-30 23:27:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:23 -0700 |
| commit | 643f720cea989d2913fc0120a2384fecc1be1f9a (patch) | |
| tree | f3afb762a3e93a2b71392ee8442f4f9a70e6b169 /drivers | |
| parent | fb48388337182013bce811b9c336e8e64b0c858b (diff) | |
[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 <drzeus@drzeus.cx>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/sdhci.c | 5 | ||||
| -rw-r--r-- | drivers/mmc/sdhci.h | 5 | ||||
| -rw-r--r-- | drivers/mmc/wbsd.c | 5 | ||||
| -rw-r--r-- | drivers/mmc/wbsd.h | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index fdfc3838dd7..4dab5ec392e 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 <linux/delay.h> diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h index f2453343f78..72a67937afe 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 6435a6822ad..88c6f0b129f 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 249baa701cb..6072993f01e 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 |