From fcc34f5c60ff5ef1579a9c317f79f1867daf14b9 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 20 Mar 2013 11:25:08 +0100 Subject: [PATCH] --- yaml --- r: 367230 b: refs/heads/master c: 2b8660ed3bfe95523561e6d6a6f1ce91389006b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/metag/mm/Kconfig | 3 --- trunk/arch/microblaze/Kconfig | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 21eb44a5c5ec..bee46122da14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7fb9e6a48b13e1edea1f0b1f00a45defd7c9e0e +refs/heads/master: 2b8660ed3bfe95523561e6d6a6f1ce91389006b1 diff --git a/trunk/arch/metag/mm/Kconfig b/trunk/arch/metag/mm/Kconfig index 975f2f4e3ecf..794f26a187f9 100644 --- a/trunk/arch/metag/mm/Kconfig +++ b/trunk/arch/metag/mm/Kconfig @@ -98,9 +98,6 @@ config MAX_ACTIVE_REGIONS default "2" if SPARSEMEM default "1" -config ARCH_POPULATES_NODE_MAP - def_bool y - config ARCH_SELECT_MEMORY_MODEL def_bool y diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig index 7843d11156e6..9dbb2448a9b2 100644 --- a/trunk/arch/microblaze/Kconfig +++ b/trunk/arch/microblaze/Kconfig @@ -38,9 +38,6 @@ config RWSEM_GENERIC_SPINLOCK config ZONE_DMA def_bool y -config ARCH_POPULATES_NODE_MAP - def_bool y - config RWSEM_XCHGADD_ALGORITHM bool