]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86/Kconfig
Merge commit 'v2.6.31-rc8' into x86/txt
[linux-2.6.git] / arch / x86 / Kconfig
index 13ffa5df37d75120e6a3965102b24a05d3ee0fb7..1401d4f0ed4834e055e3c080253bda047aa23b10 100644 (file)
@@ -179,6 +179,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
 
+config HAVE_INTEL_TXT
+       def_bool y
+       depends on EXPERIMENTAL && DMAR && ACPI
+
 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
        bool