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

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

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 20a49ba93cb9d537d3f0149fc2e60cb770c2c43d..cb837c22392203d0ef258dd9aa614f6b52f42a79 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -10,6 +10,7 @@ config UML
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select GENERIC_IO
+       select GENERIC_CLOCKEVENTS
 
 config MMU
        bool
@@ -52,15 +53,6 @@ config GENERIC_BUG
        default y
        depends on BUG
 
-config GENERIC_CLOCKEVENTS
-       bool
-       default y
-
-# Used in kernel/irq/manage.c and include/linux/irq.h
-config IRQ_RELEASE_METHOD
-       bool
-       default y
-
 config HZ
        int
        default 100