x86: unify cpu/proc|_64.c

Now cpu/proc.c and cpu/proc_64.c are same.
So cpu/proc_64.c can be removed.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 8ba7d281fbc..ee7c45235e5 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -3,9 +3,9 @@
 #
 
 obj-y                   := intel_cacheinfo.o addon_cpuid_features.o
-obj-y                   += feature_names.o
+obj-y                   += proc.o feature_names.o
 
-obj-$(CONFIG_X86_32)    += common.o proc.o bugs.o
+obj-$(CONFIG_X86_32)    += common.o bugs.o
 obj-$(CONFIG_X86_32)    += amd.o
 obj-$(CONFIG_X86_32)    += cyrix.o
 obj-$(CONFIG_X86_32)    += centaur.o
@@ -13,7 +13,6 @@ 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_64)    += proc_64.o
 
 obj-$(CONFIG_X86_MCE)   += mcheck/
 obj-$(CONFIG_MTRR)      += mtrr/