x86: let intel 64-bit use intel.c

now that arch/x86/kernel/cpu/intel_64.c and
arch/x86/kernel/cpu/intel.c are equal, drop
arch/x86/kernel/cpu/intel_64.c and fix up
the glue.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 1b29d6a8756..6761848329f 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -423,17 +423,9 @@ menuconfig PROCESSOR_SELECT
           This lets you choose what x86 vendor support code your kernel
           will include.
 
-config CPU_SUP_INTEL_32
+config CPU_SUP_INTEL
         default y
         bool "Support Intel processors" if PROCESSOR_SELECT
-        depends on !64BIT
-        help
-          This enables extended support for Intel processors
-
-config CPU_SUP_INTEL_64
-        default y
-        bool "Support Intel processors" if PROCESSOR_SELECT
-        depends on 64BIT
         help
           This enables extended support for Intel processors