diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 00:09:31 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 00:09:31 +0400 |
commit | 74e8ee8262c3f93bbc41804037b43f07b95897bb (patch) | |
tree | 03c713506de19f5f9fd7634c04a19b9534ed0962 /arch/x86/Kconfig | |
parent | 8bd6964cbd177de731b4b3ff624ef7fb6eaca15c (diff) | |
parent | ca1e631c3acf80bc5f5934ce9054a9b4880c96e1 (diff) | |
download | linux-74e8ee8262c3f93bbc41804037b43f07b95897bb.tar.xz |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull Intel SoC changes from Ingo Molnar:
"Improved Intel SoC platform support"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, tsc, apic: Unbreak static (MSR) calibration when CONFIG_X86_LOCAL_APIC=n
x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs
arch: x86: New MailBox support driver for Intel SOC's
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6a990e2107f5..5216e283820d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2358,6 +2358,14 @@ config X86_DMA_REMAP bool depends on STA2X11 +config IOSF_MBI + bool + 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" source "drivers/Kconfig" |