linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-mips / module.h

diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h
index 694f979..2af496c 100644 (file)
--- a/include/asm-mips/module.h
+++ b/include/asm-mips/module.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
 
+#include <linux/config.h>
 #include <linux/list.h>
 #include <asm/uaccess.h>
 
@@ -33,15 +34,11 @@ typedef struct {
 } Elf64_Mips_Rela;
 
 #ifdef CONFIG_32BIT
-#define MODULES_ARE_ELF32
+
 #define Elf_Shdr       Elf32_Shdr
 #define Elf_Sym                Elf32_Sym
 #define Elf_Ehdr       Elf32_Ehdr
 #define Elf_Addr       Elf32_Addr
-#define Elf_Rel                Elf32_Rel
-#define Elf_Rela       Elf32_Rela
-#define ELF_R_TYPE(X)  ELF32_R_TYPE(X)
-#define ELF_R_SYM(X)   ELF32_R_SYM(X)
 
 #define Elf_Mips_Rel   Elf32_Rel
 #define Elf_Mips_Rela  Elf32_Rela
@@ -52,15 +49,11 @@ typedef struct {
 #endif
 
 #ifdef CONFIG_64BIT
-#define MODULES_ARE_ELF64
+
 #define Elf_Shdr       Elf64_Shdr
 #define Elf_Sym                Elf64_Sym
 #define Elf_Ehdr       Elf64_Ehdr
 #define Elf_Addr       Elf64_Addr
-#define Elf_Rel                Elf64_Rel
-#define Elf_Rela       Elf64_Rela
-#define ELF_R_TYPE(X)  ELF64_R_TYPE(X)
-#define ELF_R_SYM(X)   ELF64_R_SYM(X)
 
 #define Elf_Mips_Rel   Elf64_Mips_Rel
 #define Elf_Mips_Rela  Elf64_Mips_Rela