Merge branch 'ux500/devel' into next/devel

[~andy/linux] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 77f7a384c0b5128831205165cbd51874a893d23d..efb42949cc09349e37246baa07f018648186386f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -194,9 +194,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
 config NEED_PER_CPU_PAGE_FIRST_CHUNK
        def_bool y
 
 config NEED_PER_CPU_PAGE_FIRST_CHUNK
        def_bool y
 

-config HAVE_CPUMASK_OF_CPU_MAP
-       def_bool X86_64_SMP
-

 config ARCH_HIBERNATION_POSSIBLE
        def_bool y
 
 config ARCH_HIBERNATION_POSSIBLE
        def_bool y
 


@@ -393,7 +390,7 @@ config X86_INTEL_CE
          This option compiles in support for the CE4100 SOC for settop
          boxes and media devices.
 
          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
        bool "Intel MID platform support"
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM


@@ -402,7 +399,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.
 
          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"
 
 config X86_MRST
        bool "Moorestown MID platform"


@@ -414,6 +414,7 @@ config X86_MRST
        select SPI
        select INTEL_SCU_IPC
        select X86_PLATFORM_DEVICES
        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:
        ---help---
          Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
          Internet Device(MID) platform. Moorestown consists of two chips: