aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:47:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:47:39 -0700
commitf66dd539feb849a3a00f7fac67c026e0935e373a (patch)
treea211f0229581ce38655c393f1673826111f9abba /kernel
parent17bb51d56cdc8cbf252031db3107de034cfeb44c (diff)
parent87acf5ad87b275660e2508e6935b570a20b6a073 (diff)
downloadlinux-2.6.38-lt-ux500-f66dd539feb849a3a00f7fac67c026e0935e373a.tar.gz
Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: NULL-terminate all pci_device_id tables (trivial) Fix compiler warning in kernel/modules.c
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 2df46301a7a..437a74a7524 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2037,7 +2037,7 @@ static inline void layout_symtab(struct module *mod, struct load_info *info)
{
}
-static void add_kallsyms(struct module *mod, struct load_info *info)
+static void add_kallsyms(struct module *mod, const struct load_info *info)
{
}
#endif /* CONFIG_KALLSYMS */