Commit 7529c301 authored Mar 31, 2006 by Andrew Morton Committed by Linus Torvalds Mar 31, 2006

[PATCH] modules: permit Dual-MIT/GPL licenses

One of the LEDs driver files wants to use this.

Probably drivers/mtd/maps/ipaq-flash.c wants to convert as well - right now
it'll be tainting the kernel.

Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Bowler <jbowler@acm.org>
Cc: "'Richard Purdie'" <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 0ca07731

kernel/module.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1254,6 +1254,7 @@ static inline int license_is_gpl_compatible(const char *license)
		\|\| strcmp(license, "GPL v2") == 0
		\|\| strcmp(license, "GPL and additional rights") == 0
		\|\| strcmp(license, "Dual BSD/GPL") == 0
		\|\| strcmp(license, "Dual MIT/GPL") == 0
		\|\| strcmp(license, "Dual MPL/GPL") == 0);
		}

Original line number	Diff line number	Diff line
		@@ -1254,6 +1254,7 @@ static inline int license_is_gpl_compatible(const char *license)
		\|\| strcmp(license, "GPL v2") == 0
		\|\| strcmp(license, "GPL and additional rights") == 0
		\|\| strcmp(license, "Dual BSD/GPL") == 0
		\|\| strcmp(license, "Dual MIT/GPL") == 0
		\|\| strcmp(license, "Dual MPL/GPL") == 0);
		}

Admin message