Merge branch 'linus' into x86/mce3

[linux-2.6-block.git] / arch / x86 / include / asm / hardirq.h

diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 9ebc5c2550327ed26ab88e5647fbc09833194d07..82e3e8f010439cde125a3a75c4f0d65a7068b573 100644 (file)
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -22,7 +22,7 @@ typedef struct {
 #endif
 #ifdef CONFIG_X86_MCE
        unsigned int irq_thermal_count;
-# ifdef CONFIG_X86_64
+# ifdef CONFIG_X86_MCE_THRESHOLD
        unsigned int irq_threshold_count;
 # endif
 #endif