Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / include / asm-x86 / bugs.h

diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
index ae514c76a96fd09a9c3b65d6b9176c128e1428f2..dc604985f2ad71a92be6de6a7f9d48d70816bc2d 100644 (file)
--- 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; }