Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux.git] / drivers / tee / Kconfig

diff --git a/drivers/tee/Kconfig b/drivers/tee/Kconfig
index 676ffcb649857aedd872c43bdb12d72aa0bc23df..8da63f38e6bd26e518d46e864aba4ae5143d4d5f 100644 (file)
--- a/drivers/tee/Kconfig
+++ b/drivers/tee/Kconfig
@@ -2,7 +2,7 @@
 # Generic Trusted Execution Environment Configuration
 config TEE
        tristate "Trusted Execution Environment support"
-       depends on HAVE_ARM_SMCCC || COMPILE_TEST
+       depends on HAVE_ARM_SMCCC || COMPILE_TEST || CPU_SUP_AMD
        select DMA_SHARED_BUFFER
        select GENERIC_ALLOCATOR
        help
@@ -14,7 +14,7 @@ if TEE
 menu "TEE drivers"
 
 source "drivers/tee/optee/Kconfig"
-
+source "drivers/tee/amdtee/Kconfig"
 endmenu
 
 endif