Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[sfrench/cifs-2.6.git] / arch / csky / Kconfig

diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
index 0a0558567eaaa7bc00cb30a418b840f871c4b12d..cb64f8dacd08ee6fa56f622ddb89299f1305f607 100644 (file)
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@ -36,10 +36,8 @@ config CSKY
        select HAVE_C_RECORDMCOUNT
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
-       select HAVE_MEMBLOCK
        select MAY_HAVE_SPARSE_IRQ
        select MODULES_USE_ELF_RELA if MODULES
-       select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM