1 files changed, 8 insertions, 5 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7b9eaa1ae10b..5731eb70e0a0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,6 +26,8 @@ config X86
         select HAVE_IOREMAP_PROT
         select HAVE_KPROBES
         select HAVE_MEMBLOCK
+        select HAVE_MEMBLOCK_NODE_MAP
+        select ARCH_DISCARD_MEMBLOCK
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARCH_WANT_FRAME_POINTERS
         select HAVE_DMA_ATTRS
@@ -204,9 +206,6 @@ config ZONE_DMA32
         bool
         default X86_64
 
-config ARCH_POPULATES_NODE_MAP
-        def_bool y
-
 config AUDIT_ARCH
         bool
         default X86_64
@@ -403,7 +402,7 @@ config X86_INTEL_CE
           This option compiles in support for the CE4100 SOC for settop
           boxes and media devices.
 
-config X86_INTEL_MID
+config X86_WANT_INTEL_MID
         bool "Intel MID platform support"
         depends on X86_32
         depends on X86_EXTENDED_PLATFORM
@@ -412,7 +411,10 @@ config X86_INTEL_MID
           systems which do not have the PCI legacy interfaces (Moorestown,
           Medfield). If you are building for a PC class system say N here.
 
-if X86_INTEL_MID
+if X86_WANT_INTEL_MID
+
+config X86_INTEL_MID
+        bool
 
 config X86_MRST
        bool "Moorestown MID platform"
@@ -424,6 +426,7 @@ config X86_MRST
         select SPI
         select INTEL_SCU_IPC
         select X86_PLATFORM_DEVICES
+        select X86_INTEL_MID
         ---help---
           Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
           Internet Device(MID) platform. Moorestown consists of two chips: