Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

[sfrench/cifs-2.6.git] / arch / arm / firmware / Kconfig

diff --git a/arch/arm/firmware/Kconfig b/arch/arm/firmware/Kconfig
index bb00ccf00d662e0c66d4aba76e45a09f78c42ae3..ad396af68e47024fee4c517753dd94f60265cd7e 100644 (file)
--- a/arch/arm/firmware/Kconfig
+++ b/arch/arm/firmware/Kconfig
@@ -11,6 +11,7 @@ menu "Firmware options"
 config TRUSTED_FOUNDATIONS
        bool "Trusted Foundations secure monitor support"
        depends on ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
+       default y
        help
          Some devices (including most Tegra-based consumer devices on the
          market) are booted with the Trusted Foundations secure monitor
@@ -20,7 +21,7 @@ config TRUSTED_FOUNDATIONS
          This option allows the kernel to invoke the secure monitor whenever
          required on devices using Trusted Foundations. See
          arch/arm/include/asm/trusted_foundations.h or the
-         tl,trusted-foundations device tree binding documentation for details
+         tlm,trusted-foundations device tree binding documentation for details
          on how to use it.
 
          Say n if you don't know what this is about.