Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643f720c authored Sep 30, 2006 by Pierre Ossman Committed by Linus Torvalds Oct 01, 2006

[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>

parent fb483883

arch/i386/kernel/i8237.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,11 @@
	* i8237.c: 8237A DMA controller suspend functions.		* i8237.c: 8237A DMA controller suspend functions.
	*		*
	* Written by Pierre Ossman, 2005.		* 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>		#include <linux/init.h>

drivers/mmc/sdhci.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,9 @@
	* Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved.		* Copyright (C) 2005-2006 Pierre Ossman, All Rights Reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License as published by
	* published by the Free Software Foundation.		* the Free Software Foundation; either version 2 of the License, or (at
			* your option) any later version.
	*/		*/

	#include <linux/delay.h>		#include <linux/delay.h>

drivers/mmc/sdhci.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,9 @@
	* Copyright (C) 2005 Pierre Ossman, All Rights Reserved.		* Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License as published by
	* published by the Free Software Foundation.		* the Free Software Foundation; either version 2 of the License, or (at
			* your option) any later version.
	*/		*/

	/*		/*

drivers/mmc/wbsd.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,9 @@
	* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.		* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License as published by
	* published by the Free Software Foundation.		* the Free Software Foundation; either version 2 of the License, or (at
			* your option) any later version.
	*		*
	*		*
	* Warning!		* Warning!

drivers/mmc/wbsd.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,9 @@
	* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.		* Copyright (C) 2004-2005 Pierre Ossman, All Rights Reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License as published by
	* published by the Free Software Foundation.		* the Free Software Foundation; either version 2 of the License, or (at
			* your option) any later version.
	*/		*/

	#define LOCK_CODE 0xAA		#define LOCK_CODE 0xAA