Merge branch 'x86/core' into x86/kconfig

[linux-2.6-omap-h63xx.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7fcf85182681c5d04be5d3e681cf47bdf11cabab..d571cc7e3d358e52e266cd8a52fb4b942fc7bdd5 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -169,6 +169,9 @@ config GENERIC_HARDIRQS
        bool
        default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       def_bool y
+
 config GENERIC_IRQ_PROBE
        bool
        default y