summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-02-17 17:34:13 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2017-02-20 14:56:26 +1100
commita311e738b6d81febae21f0447c5b31752f0d1634 (patch)
tree7ec9587cae739ac8ca051d97124a1f93610b2389
parent6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f (diff)
downloadlinux-stable-a311e738b6d81febae21f0447c5b31752f0d1634.tar.gz
linux-stable-a311e738b6d81febae21f0447c5b31752f0d1634.tar.bz2
linux-stable-a311e738b6d81febae21f0447c5b31752f0d1634.zip
powerpc/powernv: Make PCI non-optional
Bare metal systems without PCI don't exist, so there's no real point in making PCI optional, it just breaks the build from time to time. In fact the build is broken now if you turn off PCI_MSI but enable KVM. Using select for PCI is OK because we (powerpc) define config PCI, and it has no dependencies. Selecting PCI_MSI is slightly fishy, because it's in drivers/pci and it is user-visible, but its only dependency is PCI, so selecting it can't actually lead to breakage. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/platforms/powernv/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index 604190cab522..3a07e4dcf97c 100644
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
@@ -5,7 +5,8 @@ config PPC_POWERNV
select PPC_XICS
select PPC_ICP_NATIVE
select PPC_P7_NAP
- select PPC_PCI_CHOICE if EMBEDDED
+ select PCI
+ select PCI_MSI
select EPAPR_BOOT
select PPC_INDIRECT_PIO
select PPC_UDBG_16550