Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / hexagon / Kconfig

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index a0c0fb09d677131aa7e7a2e5be9aefdaae898ae8..04dff5bdcbf72b30aebc5c2c5287d247eb3e7d2d 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -105,9 +105,6 @@ config HEXAGON_ARCH_VERSION
        int "Architecture version"
        default 2
 
-config HEXAGON_VM
-       def_bool y
-
 config CMDLINE
        string "Default kernel command string"
        default ""
@@ -118,12 +115,6 @@ config CMDLINE
          minimum, you should specify the memory size and the root device
          (e.g., mem=64M root=/dev/nfs).
 
-config HEXAGON_ANGEL_TRAPS
-       bool "Use Angel Traps"
-       default n
-       ---help---
-         Enable angel debug traps (for printk's).
-
 config SMP
        bool "Multi-Processing support"
        ---help---