Merge branch 'linus' into perf/urgent

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / c6x / Kconfig

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 1f15b88..052f81a 100644 (file)
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -15,6 +15,7 @@ config C6X
        select IRQ_DOMAIN
        select OF
        select OF_EARLY_FLATTREE
+       select GENERIC_CLOCKEVENTS
 
 config MMU
        def_bool n
@@ -31,12 +32,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_HWEIGHT
        def_bool y
 
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-       bool
-
 config GENERIC_BUG
        def_bool y
 
@@ -125,7 +120,6 @@ source "mm/Kconfig"
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"
-source "kernel/time/Kconfig"
 
 endmenu