Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7c43569..fd70a68 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,9 +1,11 @@
 config ARM64
        def_bool y
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        select ARCH_WANT_FRAME_POINTERS
        select ARM_AMBA
+       select ARM_ARCH_TIMER
        select CLONE_BACKWARDS
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
@@ -92,7 +94,7 @@ config IOMMU_HELPER
        def_bool SWIOTLB
 
 config GENERIC_GPIO
-       def_bool y
+       bool
 
 source "init/Kconfig"
 
@@ -204,6 +206,8 @@ config COMPAT
        depends on !ARM64_64K_PAGES
        select COMPAT_BINFMT_ELF
        select HAVE_UID16
+       select OLD_SIGSUSPEND3
+       select COMPAT_OLD_SIGACTION
        help
          This option enables support for a 32-bit EL0 running under a 64-bit
          kernel at EL1. AArch32-specific components such as system calls,