diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 06:18:23 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 06:18:23 +0100 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /scripts | |
| parent | Linux 2.6.20 (diff) | |
| parent | [PATCH] use __u64 rather than u64 in parisc statfs structs (diff) | |
| download | linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.xz linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'scripts')
| -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 2aa47623f5f8..47bef62eecd7 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -933,7 +933,7 @@ static int init_section_ref_ok(const char *name) ".opd", /* see comment [OPD] at exit_section_ref_ok() */ ".toc1", /* used by ppc64 */ ".stab", - ".rodata", + ".data.rel.ro", /* used by parisc64 */ ".parainstructions", ".text.lock", "__bug_table", /* used by powerpc for BUG() */ @@ -956,6 +956,7 @@ static int init_section_ref_ok(const char *name) ".eh_frame", ".debug", ".parainstructions", + ".rodata", NULL }; /* part of section name */ |