Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen

[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 403e689df0b8f2c11503cd88df5c4d4d06f79a78..7f0b45a5d7887cf393452c7983073a683390f0e4 100644 (file)
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -3,15 +3,13 @@
 #
 
 obj-y                  := intel_cacheinfo.o addon_cpuid_features.o
-obj-y                  += proc.o capflags.o powerflags.o
+obj-y                  += proc.o capflags.o powerflags.o common.o
 
-obj-$(CONFIG_X86_32)   += common.o bugs.o cmpxchg.o
-obj-$(CONFIG_X86_64)   += common_64.o bugs_64.o
+obj-$(CONFIG_X86_32)   += bugs.o cmpxchg.o
+obj-$(CONFIG_X86_64)   += bugs_64.o
 
-obj-$(CONFIG_CPU_SUP_INTEL_32)         += intel.o
-obj-$(CONFIG_CPU_SUP_INTEL_64)         += intel_64.o
-obj-$(CONFIG_CPU_SUP_AMD_32)           += amd.o
-obj-$(CONFIG_CPU_SUP_AMD_64)           += amd_64.o
+obj-$(CONFIG_CPU_SUP_INTEL)            += intel.o
+obj-$(CONFIG_CPU_SUP_AMD)              += amd.o
 obj-$(CONFIG_CPU_SUP_CYRIX_32)         += cyrix.o
 obj-$(CONFIG_CPU_SUP_CENTAUR_32)       += centaur.o
 obj-$(CONFIG_CPU_SUP_CENTAUR_64)       += centaur_64.o