diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
| commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
| tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /scripts/mod/modpost.c | |
| parent | f2afa7711f8585ffc088ba538b9a510e0d5dca12 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index a07f91aac920..8f038e6d5f98 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -1992,7 +1992,8 @@ static void read_markers(const char *fname) | |||
| 1992 | mod->skip = 1; | 1992 | mod->skip = 1; |
| 1993 | } | 1993 | } |
| 1994 | 1994 | ||
| 1995 | add_marker(mod, marker, fmt); | 1995 | if (!mod->skip) |
| 1996 | add_marker(mod, marker, fmt); | ||
| 1996 | } | 1997 | } |
| 1997 | return; | 1998 | return; |
| 1998 | fail: | 1999 | fail: |