summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:57:11 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:57:11 +0900
commitc42978f7ecaa5c29bdd5fea507e09e6eff9d9f27 (patch)
treef5aa36fa1714e907c14eb84c779dd07d2818045e /include
parent91d95fda8594ce5e0ccd81381ee7b956cf513c59 (diff)
parentbe6528b2e58d92ef2ffed6f130e2d42bb85dbf29 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: fix format of sysfs driver/vendor files Char: virtio_console, fix memory leak virtio: return correct capacity to users module: Update prototype for ref_module (formerly use_module)
Diffstat (limited to 'include')
-rw-r--r--include/linux/module.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index b29e7458b96..7575bbbdf2a 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -517,7 +517,7 @@ static inline void __module_get(struct module *module)
#define symbol_put_addr(p) do { } while(0)
#endif /* CONFIG_MODULE_UNLOAD */
-int use_module(struct module *a, struct module *b);
+int ref_module(struct module *a, struct module *b);
/* This is a #define so the string doesn't get put in every .o file */
#define module_name(mod) \