linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h
index 9996fc7..424661d 100644 (file)
--- a/include/asm-i386/module.h
+++ b/include/asm-i386/module.h
@@ -6,14 +6,9 @@ struct mod_arch_specific
 {
 };
 
-#define MODULES_ARE_ELF32
 #define Elf_Shdr Elf32_Shdr
 #define Elf_Sym Elf32_Sym
 #define Elf_Ehdr Elf32_Ehdr
-#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)
 
 #ifdef CONFIG_M386
 #define MODULE_PROC_FAMILY "386 "
@@ -57,6 +52,10 @@ struct mod_arch_specific
 #define MODULE_PROC_FAMILY "CYRIXIII "
 #elif defined CONFIG_MVIAC3_2
 #define MODULE_PROC_FAMILY "VIAC3-2 "
+#elif defined CONFIG_MGEODEGX1
+#define MODULE_PROC_FAMILY "GEODEGX1 "
+#elif defined CONFIG_MGEODE_LX
+#define MODULE_PROC_FAMILY "GEODE "
 #else
 #error unknown processor family
 #endif
@@ -67,16 +66,8 @@ struct mod_arch_specific
 #define MODULE_REGPARM ""
 #endif
 
-#if (CONFIG_STACK_SIZE_SHIFT < 12)
-#define MODULE_STACKSIZE "TINYSTACKS "
-#elif (CONFIG_STACK_SIZE_SHIFT == 12)
+#ifdef CONFIG_4KSTACKS
 #define MODULE_STACKSIZE "4KSTACKS "
-#elif (CONFIG_STACK_SIZE_SHIFT == 13)
-#define MODULE_STACKSIZE "8KSTACKS "
-#elif (CONFIG_STACK_SIZE_SHIFT == 14)
-#define MODULE_STACKSIZE "16KSTACKS "
-#elif (CONFIG_STACK_SIZE_SHIFT > 14)
-#define MODULE_STACKSIZE "HUGESTACKS "
 #else
 #define MODULE_STACKSIZE ""
 #endif