diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-31 02:30:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 12:18:56 -0800 |
| commit | 7529c301165079d0f149d0e54724829e602f8fc0 (patch) | |
| tree | 56e0ae4caed9675f230e63274cd3c9258eaaca44 /kernel/module.c | |
| parent | 0ca07731e495584bd84dca15a0f065470d594ec4 (diff) | |
| download | kernel_samsung_smdk4412-7529c301165079d0f149d0e54724829e602f8fc0.zip kernel_samsung_smdk4412-7529c301165079d0f149d0e54724829e602f8fc0.tar.gz kernel_samsung_smdk4412-7529c301165079d0f149d0e54724829e602f8fc0.tar.bz2 | |
[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>
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c index bd088a7..d24deb0 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -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); } |