summaryrefslogtreecommitdiff
path: root/security/Kconfig
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2009-09-02 05:25:07 +0400
committerH. Peter Anvin <hpa@zytor.com>2009-09-02 05:25:07 +0400
commit69575d388603365f2afbf4166df93152df59b165 (patch)
treeca3d66668c8ec47befc0adbfa62cf135229bda59 /security/Kconfig
parent62a3207b8cf3de35368cdc3822b30b82d59eea95 (diff)
downloadlinux-69575d388603365f2afbf4166df93152df59b165.tar.xz
x86, intel_txt: clean up the impact on generic code, unbreak non-x86
Move tboot.h from asm to linux to fix the build errors of intel_txt patch on non-X86 platforms. Remove the tboot code from generic code init/main.c and kernel/cpu.c. Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 6631774672c1..5721847a7a62 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -115,7 +115,7 @@ config SECURITY_ROOTPLUG
config INTEL_TXT
bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)"
- depends on EXPERIMENTAL && X86 && DMAR && ACPI
+ depends on HAVE_INTEL_TXT
help
This option enables support for booting the kernel with the
Trusted Boot (tboot) module. This will utilize