aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXose Vazquez Perez <xose.vazquez@gmail.com>2006-06-23 05:05:13 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:03 -0400
commit8d27e9084b372441dc8c9cf361a965ee58032767 (patch)
treefa01bec4e62d494e0a3811d7e29b0b263262f42b
parentb0904e147f7cbe4be3b4dae49ddccd627bb66f16 (diff)
[PATCH] module.h: updated comments with a new license
"Dual MIT/GPL" is also accepted (kernel/module.c), so updated comments. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/module.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index c2d89e037af0..2d366098eab5 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -105,6 +105,8 @@ extern struct module __this_module;
105 * "GPL and additional rights" [GNU Public License v2 rights and more] 105 * "GPL and additional rights" [GNU Public License v2 rights and more]
106 * "Dual BSD/GPL" [GNU Public License v2 106 * "Dual BSD/GPL" [GNU Public License v2
107 * or BSD license choice] 107 * or BSD license choice]
108 * "Dual MIT/GPL" [GNU Public License v2
109 * or MIT license choice]
108 * "Dual MPL/GPL" [GNU Public License v2 110 * "Dual MPL/GPL" [GNU Public License v2
109 * or Mozilla license choice] 111 * or Mozilla license choice]
110 * 112 *