diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
commit | 1aacb90eaaac057c10fd746e189553e04cfeb291 (patch) | |
tree | eaf5b2eddc9e2e446b5402c106a3bf086aee925a /scripts/mod | |
parent | b05d59dfceaea72565b1648af929b037b0f96d7f (diff) | |
parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
Pull trivial tree changes from Jiri Kosina:
"Usual pile of patches from trivial tree that make the world go round"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
staging: go7007: remove reference to CONFIG_KMOD
aic7xxx: Remove obsolete preprocessor define
of: dma: doc fixes
doc: fix incorrect formula to calculate CommitLimit value
doc: Note need of bc in the kernel build from 3.10 onwards
mm: Fix printk typo in dmapool.c
modpost: Fix comment typo "Modules.symvers"
Kconfig.debug: Grammar s/addition/additional/
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
aic7xxx: Spelling s/termnation/termination/
arm64: mm: Remove superfluous "the" in comment
of: Spelling s/anonymouns/anonymous/
dma: imx-sdma: Spelling s/determnine/determine/
ath10k: Improve grammar in comments
ath6kl: Spelling s/determnine/determine/
of: Improve grammar for of_alias_get_id() documentation
drm/exynos: Spelling s/contro/control/
radio-bcm2048.c: fix wrong overflow check
doc: printk-formats: do not mention casts for u64/s64
doc: spelling error changes
...
Diffstat (limited to 'scripts/mod')
-rw-r--r-- | scripts/mod/modpost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 066355673930..ea7f9530afa2 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -316,7 +316,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, | |||
316 | s->module->name, | 316 | s->module->name, |
317 | is_vmlinux(s->module->name) ?"":".ko"); | 317 | is_vmlinux(s->module->name) ?"":".ko"); |
318 | } else { | 318 | } else { |
319 | /* In case Modules.symvers was out of date */ | 319 | /* In case Module.symvers was out of date */ |
320 | s->module = mod; | 320 | s->module = mod; |
321 | } | 321 | } |
322 | } | 322 | } |