powerpc/pseries: Move PCI objects to obj-y
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 1 Oct 2015 06:44:33 +0000 (16:44 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 15 Oct 2015 09:31:56 +0000 (20:31 +1100)
Make it entirely clear in the Makefile that we always build the pci
related files by moving them to obj-y.

Note that CONFIG_EEH is now always enabled on pseries, because it
depends on PSERIES && PCI.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/pseries/Makefile

index 2e857c2b6ea3411180011d2ab21b62a13c5bec3a..fc6b1aec8e3fc15d1c30e6a9b168358ce1e9ce75 100644 (file)
@@ -4,12 +4,11 @@ ccflags-$(CONFIG_PPC_PSERIES_DEBUG)   += -DDEBUG
 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
+                          firmware.o power.o dlpar.o mobility.o rng.o \
+                          pci.o pci_dlpar.o eeh_pseries.o
 obj-$(CONFIG_SMP)      += smp.o
 obj-$(CONFIG_SCANLOG)  += scanlog.o
-obj-$(CONFIG_EEH)      += eeh_pseries.o
 obj-$(CONFIG_KEXEC)    += kexec.o
-obj-$(CONFIG_PCI)      += pci.o pci_dlpar.o
 obj-$(CONFIG_PSERIES_MSI)      += msi.o
 obj-$(CONFIG_PSERIES_ENERGY)   += pseries_energy.o