diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /scripts/mod/modpost.c | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
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: |