diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /scripts/mod/modpost.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 41277963f47a..2e1141623147 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -921,6 +921,8 @@ static int init_section_ref_ok(const char *name) | |||
| 921 | ".fixup", | 921 | ".fixup", |
| 922 | ".smp_locks", | 922 | ".smp_locks", |
| 923 | ".plt", /* seen on ARCH=um build on x86_64. Harmless */ | 923 | ".plt", /* seen on ARCH=um build on x86_64. Harmless */ |
| 924 | "__ftr_fixup", /* powerpc cpu feature fixup */ | ||
| 925 | "__fw_ftr_fixup", /* powerpc firmware feature fixup */ | ||
| 924 | NULL | 926 | NULL |
| 925 | }; | 927 | }; |
| 926 | /* Start of section names */ | 928 | /* Start of section names */ |