diff --git a/[refs] b/[refs] index 8fcd4edf5307..dfc35647511a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d0f805c77902a22dda244fd092b4567066b2b9 +refs/heads/master: 074ccf8016b61f4b40066f8d737ab31e17a6afd1 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 2710018ac809..94f5a8eb2c22 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -501,10 +501,6 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See for more. -config ARCH_FLATMEM_DISABLE - def_bool y - depends on ARCH_DISCONTIGMEM_ENABLE - config NUMA bool "NUMA Support" depends on SGI_IP27 diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig index ab7cc4eb7fc1..ce327c799b44 100644 --- a/trunk/arch/parisc/Kconfig +++ b/trunk/arch/parisc/Kconfig @@ -157,10 +157,6 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See for more. -config ARCH_FLATMEM_DISABLE - def_bool y - depends on ARCH_DISCONTIGMEM_ENABLE - source "mm/Kconfig" config PREEMPT diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index ac2b865359b2..a7c8bfc11604 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -496,10 +496,6 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See for more. -config ARCH_FLATMEM_DISABLE - def_bool y - depends on ARCH_DISCONTIGMEM_ENABLE - source "mm/Kconfig" config ZERO_PAGE_OFFSET