diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-08-13 18:07:26 (GMT) |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-08-13 18:07:26 (GMT) |
commit | 734a0f6bb93d6f2c27a2b2976e9da1e31905facd (patch) | |
tree | 9bfd05c893da5c37318f5ca0147898f1d9f1fe09 /arch/x86/Kconfig | |
parent | e9f624499cc84a625648ccfbd550b74d17d52fb2 (diff) | |
parent | 6a4324ebf5cf412d55fd1ea259d4dd29fb8f90e8 (diff) | |
download | linux-734a0f6bb93d6f2c27a2b2976e9da1e31905facd.tar.xz |
Merge tag 'msi-3.12-2' into for-3.12/soc
pci msi changes for v3.12 (round 2)
- fix build breakage for s390 allyesconfig due to !HAVE_GENERIC_HARDIRQS
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b32ebf9..5db62ef 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2014,7 +2014,6 @@ menu "Bus options (PCI etc.)" config PCI bool "PCI support" default y - select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) ---help--- Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside |