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

[cascardo/linux.git] / arch / c6x / Kconfig

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 9d446ef..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
@@ -20,24 +20,12 @@ config TMS320C6X
 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