summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile_32.cpu
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2011-04-08 07:42:29 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2011-04-08 13:01:25 -0700
commitce9c99af8d4b3b0b9463654fd252d8640d804dc3 (patch)
treeb5754ba3e8bf1022c58467992435d7670112aa52 /arch/x86/Makefile_32.cpu
parent6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff)
downloadlinux-ce9c99af8d4b3b0b9463654fd252d8640d804dc3.tar.gz
linux-ce9c99af8d4b3b0b9463654fd252d8640d804dc3.tar.bz2
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/Makefile_32.cpu')
-rw-r--r--arch/x86/Makefile_32.cpu2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu
index f2ee1abb1df9..86cee7b749e1 100644
--- a/arch/x86/Makefile_32.cpu
+++ b/arch/x86/Makefile_32.cpu
@@ -37,7 +37,7 @@ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call cc-option,-march=
$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
# AMD Elan support
-cflags-$(CONFIG_X86_ELAN) += -march=i486
+cflags-$(CONFIG_MELAN) += -march=i486
# Geode GX1 support
cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx