Pull remove-hotkey into release branch

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

diff --git a/include/linux/module.h b/include/linux/module.h
index 10f771a49997e6d4f289c4be1b0013f099eb9db4..419d3ef293dd996ba4ee3fda9501feebdd13e0aa 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -58,6 +58,7 @@ struct module_kobject
 {
        struct kobject kobj;
        struct module *mod;
+       struct kobject *drivers_dir;
 };
 
 /* These are either module local, or the kernel's dummy ones. */
@@ -263,7 +264,7 @@ struct module
        struct module_attribute *modinfo_attrs;
        const char *version;
        const char *srcversion;
-       struct kobject *drivers_dir;
+       struct kobject *holders_dir;
 
        /* Exported symbols */
        const struct kernel_symbol *syms;