From: Adrian Bunk <bunk@fs.tum.de>



---

 arch/i386/Kconfig         |    3 ---
 include/asm-i386/module.h |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff -puN arch/i386/Kconfig~amd-elan-fix arch/i386/Kconfig
--- 25/arch/i386/Kconfig~amd-elan-fix	2004-03-07 17:13:35.000000000 -0800
+++ 25-akpm/arch/i386/Kconfig	2004-03-07 17:13:35.000000000 -0800
@@ -269,9 +269,6 @@ config MK8
 	  use of some extended instructions, and passes appropriate optimization
 	  flags to GCC.
 
-config MELAN
-	bool "Elan"
-
 config MCRUSOE
 	bool "Crusoe"
 	help
diff -puN include/asm-i386/module.h~amd-elan-fix include/asm-i386/module.h
--- 25/include/asm-i386/module.h~amd-elan-fix	2004-03-07 17:13:35.000000000 -0800
+++ 25-akpm/include/asm-i386/module.h	2004-03-07 17:13:35.000000000 -0800
@@ -36,7 +36,7 @@ struct mod_arch_specific
 #define MODULE_PROC_FAMILY "K7 "
 #elif defined CONFIG_MK8
 #define MODULE_PROC_FAMILY "K8 "
-#elif defined CONFIG_MELAN
+#elif defined CONFIG_X86_ELAN
 #define MODULE_PROC_FAMILY "ELAN "
 #elif defined CONFIG_MCRUSOE
 #define MODULE_PROC_FAMILY "CRUSOE "

_