diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:25:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:31:37 +1000 |
| commit | 3c19d5ada1bec8b97119215298df7669d3ffb3db (patch) | |
| tree | bbc728296e01ff7403164072e4f87ad01de2c6ea /arch/powerpc/platforms/powernv/Kconfig | |
| parent | 17ed4c8f81da2bf340d33a8c875f4d6b1dfd9398 (diff) | |
| parent | 08a1e650cc631ccc8cfe670beb38b2f9c58402cd (diff) | |
| download | linux-stable-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.gz linux-stable-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.bz2 linux-stable-3c19d5ada1bec8b97119215298df7669d3ffb3db.zip | |
Merge branch 'topic/xive' (early part) into next
This merges the arch part of the XIVE support, leaving the final commit
with the KVM specific pieces dangling on the branch for Paul to merge
via the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/platforms/powernv/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/powernv/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig index 76b8eca5767a..2489805e79f1 100644 --- a/arch/powerpc/platforms/powernv/Kconfig +++ b/arch/powerpc/platforms/powernv/Kconfig @@ -4,6 +4,7 @@ config PPC_POWERNV select PPC_NATIVE select PPC_XICS select PPC_ICP_NATIVE + select PPC_XIVE_NATIVE select PPC_P7_NAP select PCI select PCI_MSI |