diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /scripts/mod/modpost.c | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
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: |