Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / scripts / mod / modpost.h

diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 89b96c6d8ef587f3995d9975ca67e9ee2971ea18..861d866fcd8394bf2fdcec228fe8b7c81f145804 100644 (file)
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -21,6 +21,7 @@
 #define ELF_ST_BIND ELF32_ST_BIND
 #define ELF_ST_TYPE ELF32_ST_TYPE
 
+#define Elf_Rel     Elf32_Rel
 #define Elf_Rela    Elf32_Rela
 #define ELF_R_SYM   ELF32_R_SYM
 #define ELF_R_TYPE  ELF32_R_TYPE
@@ -34,6 +35,7 @@
 #define ELF_ST_BIND ELF64_ST_BIND
 #define ELF_ST_TYPE ELF64_ST_TYPE
 
+#define Elf_Rel     Elf64_Rel
 #define Elf_Rela    Elf64_Rela
 #define ELF_R_SYM   ELF64_R_SYM
 #define ELF_R_TYPE  ELF64_R_TYPE
@@ -42,17 +44,17 @@
 /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */
 typedef struct
 {
-  Elf32_Word    r_sym;         /* Symbol index */
-  unsigned char r_ssym;                /* Special symbol for 2nd relocation */
-  unsigned char r_type3;       /* 3rd relocation type */
-  unsigned char r_type2;       /* 2nd relocation type */
-  unsigned char r_type1;       /* 1st relocation type */
+       Elf32_Word    r_sym;    /* Symbol index */
+       unsigned char r_ssym;   /* Special symbol for 2nd relocation */
+       unsigned char r_type3;  /* 3rd relocation type */
+       unsigned char r_type2;  /* 2nd relocation type */
+       unsigned char r_type1;  /* 1st relocation type */
 } _Elf64_Mips_R_Info;
 
 typedef union
 {
-  Elf64_Xword  r_info_number;
-  _Elf64_Mips_R_Info r_info_fields;
+       Elf64_Xword             r_info_number;
+       _Elf64_Mips_R_Info      r_info_fields;
 } _Elf64_Mips_R_Info_union;
 
 #define ELF64_MIPS_R_SYM(i) \
@@ -67,8 +69,6 @@ static inline void __endian(const void *src, void *dest, unsigned int size)
                ((unsigned char*)dest)[i] = ((unsigned char*)src)[size - i-1];
 }
 
-
-
 #define TO_NATIVE(x)                                           \
 ({                                                             \
        typeof(x) __x;                                          \