diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-08-13 20:07:26 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-08-13 20:07:26 +0200 |
| commit | 734a0f6bb93d6f2c27a2b2976e9da1e31905facd (patch) | |
| tree | 9bfd05c893da5c37318f5ca0147898f1d9f1fe09 /arch/powerpc/Kconfig | |
| parent | ARM: tegra: add LP1 suspend support for Tegra114 (diff) | |
| parent | PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms (diff) | |
| download | linux-734a0f6bb93d6f2c27a2b2976e9da1e31905facd.tar.xz linux-734a0f6bb93d6f2c27a2b2976e9da1e31905facd.zip | |
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/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3bf72cd2c8fc..183a16509e8f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -727,7 +727,6 @@ config PCI default y if !40x && !CPM2 && !8xx && !PPC_83xx \ && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON default PCI_QSPAN if !4xx && !CPM2 && 8xx - select ARCH_SUPPORTS_MSI select GENERIC_PCI_IOMAP help Find out whether your system includes a PCI bus. PCI is the name of |