x86: unify CPU feature string names

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / cpu / Makefile

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 778396c78d65c5f4d4c779314223fe2874e6b429..a0c4d7c5dbd7bcf944fbc4e23ea74215c80c6d42 100644 (file)
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -2,19 +2,20 @@
 # Makefile for x86-compatible CPU details and quirks
 #
 
-obj-y  :=      common.o proc.o bugs.o
+obj-y                  := intel_cacheinfo.o addon_cpuid_features.o
+obj-y                  += feature_names.o
 
-obj-y  +=      amd.o
-obj-y  +=      cyrix.o
-obj-y  +=      centaur.o
-obj-y  +=      transmeta.o
-obj-y  +=      intel.o intel_cacheinfo.o addon_cpuid_features.o
-obj-y  +=      nexgen.o
-obj-y  +=      umc.o
+obj-$(CONFIG_X86_32)   += common.o proc.o bugs.o
+obj-$(CONFIG_X86_32)   += amd.o
+obj-$(CONFIG_X86_32)   += cyrix.o
+obj-$(CONFIG_X86_32)   += centaur.o
+obj-$(CONFIG_X86_32)   += transmeta.o
+obj-$(CONFIG_X86_32)   += intel.o
+obj-$(CONFIG_X86_32)   += nexgen.o
+obj-$(CONFIG_X86_32)   += umc.o
 
-obj-$(CONFIG_X86_MCE)  +=      mcheck/
-
-obj-$(CONFIG_MTRR)     +=      mtrr/
-obj-$(CONFIG_CPU_FREQ) +=      cpufreq/
+obj-$(CONFIG_X86_MCE)  += mcheck/
+obj-$(CONFIG_MTRR)     += mtrr/
+obj-$(CONFIG_CPU_FREQ) += cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o