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 1c3ccd4..052f81a 100644 (file)
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -3,7 +3,7 @@
 # see Documentation/kbuild/kconfig-language.txt.
 #
 
-config TMS320C6X
+config C6X
        def_bool y
        select CLKDEV_LOOKUP
        select GENERIC_IRQ_SHOW
@@ -15,40 +15,23 @@ config TMS320C6X
        select IRQ_DOMAIN
        select OF
        select OF_EARLY_FLATTREE
+       select GENERIC_CLOCKEVENTS
 
 config MMU
        def_bool n
 
-config ZONE_DMA
-       def_bool y
-
 config FPU
        def_bool n
 
-config HIGHMEM
-       def_bool n
-
-config NUMA
-       def_bool n
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
-config RWSEM_XCHGADD_ALGORITHM
-       def_bool n
-
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
 config GENERIC_HWEIGHT
        def_bool y
 
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-       bool
-
 config GENERIC_BUG
        def_bool y
 
@@ -137,7 +120,6 @@ source "mm/Kconfig"
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"
-source "kernel/time/Kconfig"
 
 endmenu