2004-03-07 16:36:29

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] small fix for the "AMD Elan is a different subarch" patch

It seems the part of the patch below got lost somewhere.

Please apply
Adrian

--- linux-2.6.4-rc1-mm2/arch/i386/Kconfig.old 2004-03-07 17:13:46.000000000 +0100
+++ linux-2.6.4-rc1-mm2/arch/i386/Kconfig 2004-03-07 17:16:05.000000000 +0100
@@ -269,9 +269,6 @@
use of some extended instructions, and passes appropriate optimization
flags to GCC.

-config MELAN
- bool "Elan"
-
config MCRUSOE
bool "Crusoe"
help
--- linux-2.6.4-rc1-mm2/include/asm-i386/module.h.old 2004-03-07 17:16:41.000000000 +0100
+++ linux-2.6.4-rc1-mm2/include/asm-i386/module.h 2004-03-07 17:17:09.000000000 +0100
@@ -36,7 +36,7 @@
#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 "