diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2011-04-08 08:42:29 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-04-08 22:01:25 +0200 |
| commit | ce9c99af8d4b3b0b9463654fd252d8640d804dc3 (patch) | |
| tree | b5754ba3e8bf1022c58467992435d7670112aa52 /arch/x86/include/asm/module.h | |
| parent | Linux 2.6.39-rc2 (diff) | |
| download | linux-ce9c99af8d4b3b0b9463654fd252d8640d804dc3.tar.xz linux-ce9c99af8d4b3b0b9463654fd252d8640d804dc3.zip | |
x86, cpu: Move AMD Elan Kconfig under "Processor family"
Currently the option resides under X86_EXTENDED_PLATFORM due to historical
nonstandard A20M# handling. However that is no longer the case and so Elan can
be treated as part of the standard processor choice Kconfig option.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Link: http://lkml.kernel.org/r/1302245177.31620.47.camel@localhost.localdomain
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/module.h')
| -rw-r--r-- | arch/x86/include/asm/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h index 67763c5d8b4e..9eae7752ae9b 100644 --- a/arch/x86/include/asm/module.h +++ b/arch/x86/include/asm/module.h @@ -35,7 +35,7 @@ #define MODULE_PROC_FAMILY "K7 " #elif defined CONFIG_MK8 #define MODULE_PROC_FAMILY "K8 " -#elif defined CONFIG_X86_ELAN +#elif defined CONFIG_MELAN #define MODULE_PROC_FAMILY "ELAN " #elif defined CONFIG_MCRUSOE #define MODULE_PROC_FAMILY "CRUSOE " |