diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:25:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:25:43 +1000 |
| commit | a46d9a418168bea55cc9a893dca1777d7f2210c4 (patch) | |
| tree | 5c9f722191bfdf9f241778ef677b847b6f1dcb9e /scripts | |
| parent | f19bb4b096f2ffe1dcd88f967cb2d3ee2bd83853 (diff) | |
| parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Diffstat (limited to 'scripts')
| -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 ea3e2bdf182..026543ba8d8 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, s->module->name, is_vmlinux(s->module->name) ?"":".ko"); } else { - /* In case Modules.symvers was out of date */ + /* In case Module.symvers was out of date */ s->module = mod; } } |