diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 11:05:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 11:05:15 -0700 |
| commit | 2a2ed2db353d949c06b6ef8b6913f65b39111eab (patch) | |
| tree | d835c3dd101da91089c3bdf51c8632e84be37232 /kernel | |
| parent | 972d19e837833b93466c6f6a8ef2a7d653000aa3 (diff) | |
| parent | 070b98bfda3d27269519067c1c67eaef695f3e0c (diff) | |
| download | op-kernel-dev-2a2ed2db353d949c06b6ef8b6913f65b39111eab.zip op-kernel-dev-2a2ed2db353d949c06b6ef8b6913f65b39111eab.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: trivial fixes in Makefile
kbuild: adding symbols in Kconfig and defconfig to TAGS
kbuild: replace abort() with exit(1)
kbuild: support for %.symtypes files
kbuild: fix silentoldconfig recursion
kbuild: add option for stripping modules while installing them
kbuild: kill some false positives from modpost
kbuild: export-symbol usage report generator
kbuild: fix make -rR breakage
kbuild: append -dirty for updated but uncommited changes
kbuild: append git revision for all untagged commits
kbuild: fix module.symvers parsing in modpost
kbuild: ignore make's built-in rules & variables
kbuild: bugfix with initramfs
kbuild: modpost build fix
kbuild: check license compatibility when building modules
kbuild: export-type enhancement to modpost.c
kbuild: add dependency on kernel.release to the package targets
kbuild: `make kernelrelease' speedup
kconfig: KCONFIG_OVERWRITECONFIG
...
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/module.c b/kernel/module.c index 08811e2..10e5b87 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -44,6 +44,7 @@ #include <asm/uaccess.h> #include <asm/semaphore.h> #include <asm/cacheflush.h> +#include <linux/license.h> #if 0 #define DEBUGP printk @@ -1251,16 +1252,6 @@ static void layout_sections(struct module *mod, } } -static inline int license_is_gpl_compatible(const char *license) -{ - return (strcmp(license, "GPL") == 0 - || 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); -} - static void set_license(struct module *mod, const char *license) { if (!license) |
