Merge commit 'v2.6.36-rc7' into perf/core

[net-next-2.6.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 403ac26023ce05dc9ae25c2d98f2e372e9e85cd1..b29e7458b96642b2f36162aa755b10ff76b15abe 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -689,17 +689,16 @@ extern int module_sysfs_initialized;
 
 
 #ifdef CONFIG_GENERIC_BUG
-int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
+void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
                         struct module *);
 void module_bug_cleanup(struct module *);
 
 #else  /* !CONFIG_GENERIC_BUG */
 
-static inline int  module_bug_finalize(const Elf_Ehdr *hdr,
+static inline void module_bug_finalize(const Elf_Ehdr *hdr,
                                        const Elf_Shdr *sechdrs,
                                        struct module *mod)
 {
-       return 0;
 }
 static inline void module_bug_cleanup(struct module *mod) {}
 #endif /* CONFIG_GENERIC_BUG */