diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:50:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:50:17 -0400 |
| commit | 9c5891bd4342349a200676d33f742dd1b864822c (patch) | |
| tree | b14c1698f2d8ce5276e1befd562f6398a46b48b9 /arch/powerpc/include/asm/module.h | |
| parent | ecda040ff3724f021a96491ecee88d48e968c153 (diff) | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
Merge 3.11-rc3 into char-misc-next.
This resolves a merge issue with:
drivers/misc/mei/init.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/include/asm/module.h')
| -rw-r--r-- | arch/powerpc/include/asm/module.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h index c1df590ec444..49fa55bfbac4 100644 --- a/arch/powerpc/include/asm/module.h +++ b/arch/powerpc/include/asm/module.h | |||
| @@ -82,10 +82,9 @@ struct exception_table_entry; | |||
| 82 | void sort_ex_table(struct exception_table_entry *start, | 82 | void sort_ex_table(struct exception_table_entry *start, |
| 83 | struct exception_table_entry *finish); | 83 | struct exception_table_entry *finish); |
| 84 | 84 | ||
| 85 | #ifdef CONFIG_MODVERSIONS | 85 | #if defined(CONFIG_MODVERSIONS) && defined(CONFIG_PPC64) |
| 86 | #define ARCH_RELOCATES_KCRCTAB | 86 | #define ARCH_RELOCATES_KCRCTAB |
| 87 | 87 | #define reloc_start PHYSICAL_START | |
| 88 | extern const unsigned long reloc_start[]; | ||
| 89 | #endif | 88 | #endif |
| 90 | #endif /* __KERNEL__ */ | 89 | #endif /* __KERNEL__ */ |
| 91 | #endif /* _ASM_POWERPC_MODULE_H */ | 90 | #endif /* _ASM_POWERPC_MODULE_H */ |