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

Pull x86 IOSF platform updates from Ingo Molnar:
 "IOSF (Intel OnChip System Fabric) updates:

   - generalize the IOSF interface to allow mixed mode drivers: non-IOSF
     drivers to utilize of IOSF features on IOSF platforms.

   - add 'Quark X1000' IOSF/MBI support

   - clean up BayTrail and Quark PCI ID enumeration"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, iosf: Add PCI ID macros for better readability
  x86, iosf: Add Quark X1000 PCI ID
  x86, iosf: Added Quark MBI identifiers
  x86, iosf: Make IOSF driver modular and usable by more drivers

diff --combined arch/x86/Kconfig
index 650433a,f1304d3..7d5feb5
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -261,9 -261,6 +261,9 @@@ config ARCH_HWEIGHT_CFLAG
  config ARCH_SUPPORTS_UPROBES
        def_bool y
  
 +config FIX_EARLYCON_MEM
 +      def_bool y
 +
  source "init/Kconfig"
  source "kernel/Kconfig.freezer"
  
@@@ -418,6 -415,7 +418,6 @@@ config X86_U
  
  config X86_GOLDFISH
         bool "Goldfish (Virtual Platform)"
 -       depends on X86_32
         depends on X86_EXTENDED_PLATFORM
         ---help---
         Enable support for the Goldfish virtual platform used primarily
@@@ -2377,12 -2375,9 +2377,9 @@@ config X86_DMA_REMA
        depends on STA2X11
  
  config IOSF_MBI
-       bool
+       tristate
+       default m
        depends on PCI
-       ---help---
-         To be selected by modules requiring access to the Intel OnChip System
-         Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms
-         enumerable by PCI.
  
  source "net/Kconfig"