diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:47:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:47:39 -0400 |
| commit | f66dd539feb849a3a00f7fac67c026e0935e373a (patch) | |
| tree | a211f0229581ce38655c393f1673826111f9abba /kernel | |
| parent | 17bb51d56cdc8cbf252031db3107de034cfeb44c (diff) | |
| parent | 87acf5ad87b275660e2508e6935b570a20b6a073 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 2df46301a7a4..437a74a7524a 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) | |||
| 2037 | { | 2037 | { |
| 2038 | } | 2038 | } |
| 2039 | 2039 | ||
| 2040 | static void add_kallsyms(struct module *mod, struct load_info *info) | 2040 | static void add_kallsyms(struct module *mod, const struct load_info *info) |
| 2041 | { | 2041 | { |
| 2042 | } | 2042 | } |
| 2043 | #endif /* CONFIG_KALLSYMS */ | 2043 | #endif /* CONFIG_KALLSYMS */ |