Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6c29256..9019523 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -422,27 +422,6 @@ if X86_WANT_INTEL_MID
 config X86_INTEL_MID
        bool
 
-config X86_MRST
-       bool "Moorestown MID platform"
-       depends on PCI
-       depends on PCI_GOANY
-       depends on X86_IO_APIC
-       select X86_INTEL_MID
-       select SFI
-       select DW_APB_TIMER
-       select APB_TIMER
-       select I2C
-       select SPI
-       select INTEL_SCU_IPC
-       select X86_PLATFORM_DEVICES
-       ---help---
-         Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
-         Internet Device(MID) platform. Moorestown consists of two chips:
-         Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.
-         Unlike standard x86 PCs, Moorestown does not have many legacy devices
-         nor standard legacy replacement devices/features. e.g. Moorestown does
-         not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
-
 config X86_MDFLD
        bool "Medfield MID platform"
        depends on PCI
@@ -456,6 +435,7 @@ config X86_MDFLD
        select SPI
        select INTEL_SCU_IPC
        select X86_PLATFORM_DEVICES
+       select MFD_INTEL_MSIC
        ---help---
          Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
          Internet Device(MID) platform. 
@@ -2139,6 +2119,12 @@ config ALIX
 
          Note: You have to set alix.force=1 for boards with Award BIOS.
 
+config NET5501
+       bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
+       select GPIOLIB
+       ---help---
+         This option enables system support for the Soekris Engineering net5501.
+
 endif # X86_32
 
 config AMD_NB