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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4f4c8115d79b21476892e1dc0df5f90ac0f51178..312450941a1a6ed007b00f306b4cf321a2dae1ee 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -40,6 +40,8 @@ config ARM
        select GENERIC_PCI_IOMAP
        select HAVE_BPF_JIT
        select GENERIC_SMP_IDLE_THREAD
+       select KTIME_SCALAR
+       select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
@@ -63,22 +65,6 @@ config SYS_SUPPORTS_APM_EMULATION
 config GENERIC_GPIO
        bool
 
-config ARCH_USES_GETTIMEOFFSET
-       bool
-       default n
-
-config GENERIC_CLOCKEVENTS
-       bool
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-       bool
-       depends on GENERIC_CLOCKEVENTS
-       default y if SMP
-
-config KTIME_SCALAR
-       bool
-       default y
-
 config HAVE_TCM
        bool
        select GENERIC_ALLOCATOR
@@ -1438,8 +1424,6 @@ endmenu
 
 menu "Kernel Features"
 
-source "kernel/time/Kconfig"
-
 config HAVE_SMP
        bool
        help