diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:58 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:58 -0500 |
| commit | d05f06e60df4f56a70fb8a3e46335b40687169e9 (patch) | |
| tree | c1eec6749fed86a21b08606e1e4acefe4b033253 /arch/tile/kernel | |
| parent | 0af1c5300db31f25a412e6e83d42b1747d56c9de (diff) | |
| parent | 1d72d9f83df057e71c7951def41138a0230bf737 (diff) | |
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/tile/kernel')
| -rw-r--r-- | arch/tile/kernel/module.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index 001cbfa10ac..243ffebe38d 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c | |||
| @@ -24,16 +24,6 @@ | |||
| 24 | #include <asm/homecache.h> | 24 | #include <asm/homecache.h> |
| 25 | #include <arch/opcode.h> | 25 | #include <arch/opcode.h> |
| 26 | 26 | ||
| 27 | #ifdef __tilegx__ | ||
| 28 | # define Elf_Rela Elf64_Rela | ||
| 29 | # define ELF_R_SYM ELF64_R_SYM | ||
| 30 | # define ELF_R_TYPE ELF64_R_TYPE | ||
| 31 | #else | ||
| 32 | # define Elf_Rela Elf32_Rela | ||
| 33 | # define ELF_R_SYM ELF32_R_SYM | ||
| 34 | # define ELF_R_TYPE ELF32_R_TYPE | ||
| 35 | #endif | ||
| 36 | |||
| 37 | #ifdef MODULE_DEBUG | 27 | #ifdef MODULE_DEBUG |
| 38 | #define DEBUGP printk | 28 | #define DEBUGP printk |
| 39 | #else | 29 | #else |