diff options
| author | Linus Torvalds | 2014-06-04 00:46:38 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-04 00:46:38 +0200 |
| commit | 4aef77b2fe373cdba461925589b9d1d4468ee016 (patch) | |
| tree | 96b27318a112e315eff3c38e77705bf9a6b5a174 /arch/x86/Kconfig | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | x86, iosf: Add PCI ID macros for better readability (diff) | |
| download | kernel-qcow2-linux-4aef77b2fe373cdba461925589b9d1d4468ee016.tar.gz kernel-qcow2-linux-4aef77b2fe373cdba461925589b9d1d4468ee016.tar.xz kernel-qcow2-linux-4aef77b2fe373cdba461925589b9d1d4468ee016.zip | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
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
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 650433ab184f..7d5feb5908dd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2377,12 +2377,9 @@ config X86_DMA_REMAP 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" |