powerpc/pseries: Drop always true CONFIG_PSERIES_MSI

Now that pseries selects PCI_MSI && PCI, EEH will always be true, and
therefore CONFIG_PSERIES_MSI will always be true. So drop it, and move
msi.o to obj-y.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index d9068a3d6af455f9b8b9f4a841130c226fcb2113..bec90fb3042548abd6a8e2b921aeff6c2730808f 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -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

diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index fc6b1aec8e3fc15d1c30e6a9b168358ce1e9ce75..fedc2ccf029d9f195f7a988872a2edeed9c36338 100644 (file)
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -5,11 +5,10 @@ obj-y                 := lpar.o hvCall.o nvram.o reconfig.o \
                           of_helpers.o \
                           setup.o iommu.o event_sources.o ras.o \
                           firmware.o power.o dlpar.o mobility.o rng.o \
-                          pci.o pci_dlpar.o eeh_pseries.o
+                          pci.o pci_dlpar.o eeh_pseries.o msi.o
 obj-$(CONFIG_SMP)      += smp.o
 obj-$(CONFIG_SCANLOG)  += scanlog.o
 obj-$(CONFIG_KEXEC)    += kexec.o
-obj-$(CONFIG_PSERIES_MSI)      += msi.o
 obj-$(CONFIG_PSERIES_ENERGY)   += pseries_energy.o
 
 obj-$(CONFIG_HOTPLUG_CPU)      += hotplug-cpu.o