Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[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 3ede19a4e0b20c2323749d4ce8fc9ce220e50b79..82ec6075c057b695cf6904a28a58fb8c60c37d7a 100644 (file)
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -3,19 +3,17 @@
 #
 
 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_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
 obj-$(CONFIG_CPU_SUP_TRANSMETA_32)     += transmeta.o
-obj-$(CONFIG_CPU_SUP_INTEL_32)         += intel.o
-obj-$(CONFIG_CPU_SUP_INTEL_64)         += intel_64.o
 obj-$(CONFIG_CPU_SUP_UMC_32)           += umc.o
 
 obj-$(CONFIG_X86_MCE)  += mcheck/
@@ -27,7 +25,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
 quiet_cmd_mkcapflags = MKCAP   $@
       cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
 
-cpufeature = $(src)/../../../../include/asm-x86/cpufeature.h
+cpufeature = $(src)/../../include/asm/cpufeature.h
 
 targets += capflags.c
 $(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE