Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog

[linux.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index d9ca2d5dc6d0d974c5d57eb89479365d0a9f8796..1c30087a2d8134e60696a04665ad39c4b01bc7c5 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -48,10 +48,18 @@ struct modversion_info
 
 struct module;
 
 
 struct module;
 

+struct module_kobject {
+       struct kobject kobj;
+       struct module *mod;
+       struct kobject *drivers_dir;
+       struct module_param_attrs *mp;
+};
+

 struct module_attribute {
 struct module_attribute {

-        struct attribute attr;
-        ssize_t (*show)(struct module_attribute *, struct module *, char *);
-        ssize_t (*store)(struct module_attribute *, struct module *,
+       struct attribute attr;
+       ssize_t (*show)(struct module_attribute *, struct module_kobject *,
+                       char *);
+       ssize_t (*store)(struct module_attribute *, struct module_kobject *,

                         const char *, size_t count);
        void (*setup)(struct module *, const char *);
        int (*test)(struct module *);
                         const char *, size_t count);
        void (*setup)(struct module *, const char *);
        int (*test)(struct module *);


@@ -65,15 +73,9 @@ struct module_version_attribute {
 } __attribute__ ((__aligned__(sizeof(void *))));
 
 extern ssize_t __modver_version_show(struct module_attribute *,
 } __attribute__ ((__aligned__(sizeof(void *))));
 
 extern ssize_t __modver_version_show(struct module_attribute *,

-                                    struct module *, char *);
+                                    struct module_kobject *, char *);

 
 

-struct module_kobject
-{
-       struct kobject kobj;
-       struct module *mod;
-       struct kobject *drivers_dir;
-       struct module_param_attrs *mp;
-};
+extern struct module_attribute module_uevent;

 
 /* These are either module local, or the kernel's dummy ones. */
 extern int init_module(void);
 
 /* These are either module local, or the kernel's dummy ones. */
 extern int init_module(void);