commit 879d792b66d633bbe466974f61d1acc9aa8c78eb
author Yinghai Lu <yhlu.kernel@gmail.com> Tue Sep 09 16:40:37 2008 -0700
committer Ingo Molnar <mingo@elte.hu> Wed Sep 10 08:21:05 2008 +0200
tree 4e1367fcde52da73daa6558606ce34aa39547e9d
parent 58602c1681bdfa1a0deaa5574b8a72d6e30c0e97

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>

include/asm-x86/bugs.h

diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
index ae514c7..dc60498 100644
--- a/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
@@ -3,7 +3,7 @@
 
 extern void check_bugs(void);
 
-#ifdef CONFIG_CPU_SUP_INTEL_32
+#if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_32)
 int ppro_with_ram_bug(void);
 #else
 static inline int ppro_with_ram_bug(void) { return 0; }