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

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

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 9b94b0fcb777f5c6d2a6c2ba16ea03911cb5261c..33a97929d055ca9d1131ffce9c517b3a4597bb38 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -30,8 +30,6 @@ config HEXAGON
        select GENERIC_CLOCKEVENTS_BROADCAST
        select MODULES_USE_ELF_RELA
        select GENERIC_CPU_DEVICES
-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.
@@ -77,9 +75,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        def_bool y
 
-config GENERIC_FIND_NEXT_BIT
-       def_bool y
-
 config GENERIC_HWEIGHT
        def_bool y
 
@@ -108,9 +103,6 @@ config HEXAGON_ARCH_VERSION
        int "Architecture version"
        default 2
 
-config HEXAGON_VM
-       def_bool y
-
 config CMDLINE
        string "Default kernel command string"
        default ""
@@ -121,12 +113,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---
@@ -169,9 +155,6 @@ source "mm/Kconfig"
 
 source "kernel/Kconfig.hz"
 
-config GENERIC_GPIO
-       def_bool n
-
 endmenu
 
 source "init/Kconfig"