Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 2c599175c583c36a0bbd71528640489fceb6c149..4b2d8091a4104a0cd603d64a9240d6dbdf9b5396 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -320,6 +320,8 @@ struct module
        /* Am I GPL-compatible */
        int license_gplok;
 
+       unsigned int taints;    /* same bits as kernel:tainted */
+
 #ifdef CONFIG_MODULE_UNLOAD
        /* Reference counts */
        struct module_ref ref[NR_CPUS];