diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /scripts/mod/modpost.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'scripts/mod/modpost.c')
| -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 757294b4f322..508c5895c680 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -721,7 +721,7 @@ static int check_section(const char *modname, const char *sec) | |||
| 721 | /* consume all digits */ | 721 | /* consume all digits */ |
| 722 | while (*e && e != sec && isdigit(*e)) | 722 | while (*e && e != sec && isdigit(*e)) |
| 723 | e--; | 723 | e--; |
| 724 | if (*e == '.') { | 724 | if (*e == '.' && !strstr(sec, ".linkonce")) { |
| 725 | warn("%s (%s): unexpected section name.\n" | 725 | warn("%s (%s): unexpected section name.\n" |
| 726 | "The (.[number]+) following section name are " | 726 | "The (.[number]+) following section name are " |
| 727 | "ld generated and not expected.\n" | 727 | "ld generated and not expected.\n" |