[PATCH] m32r: remove old ELF relocation types

Remove old relocation type definitions from include/asm-m32r/elf.h.  These
ELF relocations are obsolete and no longer used.

	* include/asm-m32r/elf.h:
	- Remove old relocation types.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

include/asm-m32r/elf.h

@@ -24,47 +24,9 @@
 #define	R_M32R_HI16_SLO		8
 #define	R_M32R_LO16		9
 #define	R_M32R_SDA16		10
-#ifdef OLD_TYPE
-#define	R_M32R_GOT24		11
-#define	R_M32R_26_PLTREL	12
-#define	R_M32R_GOT16_HI_ULO	13
-#define	R_M32R_GOT16_HI_SLO	14
-#define	R_M32R_GOT16_LO		15
-#define	R_M32R_GOTPC24		16
-#define	R_M32R_COPY		17
-#define	R_M32R_GLOB_DAT		18
-#define	R_M32R_JMP_SLOT		19
-#define	R_M32R_RELATIVE		20
-#define	R_M32R_GNU_VTINHERIT	21
-#define	R_M32R_GNU_VTENTRY	22
-
-#define R_M32R_16_RELA		R_M32R_16
-#define R_M32R_32_RELA		R_M32R_32
-#define R_M32R_24_RELA		R_M32R_24
-#define R_M32R_10_PCREL_RELA	R_M32R_10_PCREL
-#define R_M32R_18_PCREL_RELA	R_M32R_18_PCREL
-#define R_M32R_26_PCREL_RELA	R_M32R_26_PCREL
-#define R_M32R_HI16_ULO_RELA	R_M32R_HI16_ULO
-#define R_M32R_HI16_SLO_RELA	R_M32R_HI16_SLO
-#define R_M32R_LO16_RELA	R_M32R_LO16
-#define R_M32R_SDA16_RELA	R_M32R_SDA16
-#else /* not OLD_TYPE */
 #define	R_M32R_GNU_VTINHERIT	11
 #define	R_M32R_GNU_VTENTRY	12
 
-#define	R_M32R_GOT24_SAMPLE		11 /* comflict */
-#define	R_M32R_26_PLTREL_SAMPLE	12 /* comflict */
-#define	R_M32R_GOT16_HI_ULO_SAMPLE	13
-#define	R_M32R_GOT16_HI_SLO_SAMPLE	14
-#define	R_M32R_GOT16_LO_SAMPLE		15
-#define	R_M32R_GOTPC24_SAMPLE		16
-#define	R_M32R_COPY_SAMPLE		17
-#define	R_M32R_GLOB_DAT_SAMPLE		18
-#define	R_M32R_JMP_SLOT_SAMPLE		19
-#define	R_M32R_RELATIVE_SAMPLE		20
-#define	R_M32R_GNU_VTINHERIT_SAMPLE	21
-#define	R_M32R_GNU_VTENTRY_SAMPLE	22
-
 #define R_M32R_16_RELA		33
 #define R_M32R_32_RELA		34
 #define R_M32R_24_RELA		35
@@ -92,7 +54,6 @@
 #define R_M32R_GOTPC_HI_ULO	59
 #define R_M32R_GOTPC_HI_SLO	60
 #define R_M32R_GOTPC_LO		61
-#endif /* not OLD_TYPE */
 
 #define R_M32R_NUM		256