Merge branch 'linus' into timers/core

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 70c0f3da0476a35ba93546689bb4b06b5f576bba..9f74f523dfc66c84c097351f59d0d0bbe2fdad8f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -120,6 +120,7 @@ config X86
        select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
        select OLD_SIGACTION if X86_32
        select COMPAT_OLD_SIGACTION if IA32_EMULATION
+       select RTC_LIB
 
 config INSTRUCTION_DECODER
        def_bool y
@@ -1549,6 +1550,7 @@ config X86_SMAP
 config EFI
        bool "EFI runtime service support"
        depends on ACPI
+       select UCS2_STRING
        ---help---
          This enables the kernel to use EFI runtime services that are
          available (such as the EFI variable services).