summaryrefslogtreecommitdiffstats
path: root/arch/i386/Makefile
diff options
context:
space:
mode:
authorAnton Altaparmakov2005-05-21 23:00:02 +0200
committerAnton Altaparmakov2005-05-21 23:00:02 +0200
commit67394f8f069c2fdf90f3b6d851824c07815442af (patch)
tree0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /arch/i386/Makefile
parentMerge with /usr/src/ntfs-2.6.git (diff)
parentAutomatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git (diff)
downloadkernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.gz
kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.tar.xz
kernel-qcow2-linux-67394f8f069c2fdf90f3b6d851824c07815442af.zip
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'arch/i386/Makefile')
-rw-r--r--arch/i386/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 04783ceb050c..1c36ca332a96 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -14,7 +14,7 @@
# 19990713 Artur Skawina <skawina@geocities.com>
# Added '-march' and '-mpreferred-stack-boundary' support
#
-# Kianusch Sayah Karadji <kianusch@sk-tech.net>
+# 20050320 Kianusch Sayah Karadji <kianusch@sk-tech.net>
# Added support for GEODE CPU
LDFLAGS := -m elf_i386
@@ -54,8 +54,8 @@ cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686)
# AMD Elan support
cflags-$(CONFIG_X86_ELAN) += -march=i486
-# MediaGX aka Geode support
-cflags-$(CONFIG_MGEODE) += $(call cc-option,-march=pentium-mmx,-march=i586)
+# Geode GX1 support
+cflags-$(CONFIG_MGEODEGX1) += $(call cc-option,-march=pentium-mmx,-march=i486)
# -mregparm=3 works ok on gcc-3.0 and later
#