These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / platforms / pseries / Kconfig

diff --git a/kernel/arch/powerpc/platforms/pseries/Kconfig b/kernel/arch/powerpc/platforms/pseries/Kconfig
index 54c87d5..bec90fb 100644 (file)
--- a/kernel/arch/powerpc/platforms/pseries/Kconfig
+++ b/kernel/arch/powerpc/platforms/pseries/Kconfig
@@ -4,6 +4,7 @@ config PPC_PSERIES
        select HAVE_PCSPKR_PLATFORM
        select MPIC
        select OF_DYNAMIC
+       select PCI
        select PCI_MSI
        select PPC_XICS
        select PPC_ICP_NATIVE
@@ -15,7 +16,6 @@ config PPC_PSERIES
        select RTAS_ERROR_LOGGING
        select PPC_UDBG_16550
        select PPC_NATIVE
-       select PPC_PCI_CHOICE if EXPERT
        select PPC_DOORBELL
        select HAVE_CONTEXT_TRACKING
        select HOTPLUG_CPU if SMP
@@ -43,11 +43,6 @@ config DTL
 
          Say N if you are unsure.
 
-config PSERIES_MSI
-       bool
-       depends on PCI_MSI && PPC_PSERIES && EEH
-       default y
-
 config PSERIES_ENERGY
        tristate "pSeries energy management capabilities driver"
        depends on PPC_PSERIES