Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / ppc / syslib / Makefile

diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index d84f04666972d579ac15444566a20e9b2ba567d4..95694159b22602310fa088e39c8bb4d628792674 100644 (file)
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -18,7 +18,8 @@ obj-$(CONFIG_440SP)           += ibm440gx_common.o ibm440sp_common.o
 obj-$(CONFIG_440SPE)           += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o
 ifeq ($(CONFIG_4xx),y)
 ifeq ($(CONFIG_XILINX_VIRTEX),y)
-obj-$(CONFIG_40x)              += xilinx_pic.o ppc_sys.o
+obj-$(CONFIG_40x)              += xilinx_pic.o
+obj-y                          += virtex_devices.o
 else
 ifeq ($(CONFIG_403),y)
 obj-$(CONFIG_40x)              += ppc403_pic.o
@@ -69,6 +70,7 @@ obj-$(CONFIG_SANDPOINT)               += pci_auto.o todc_time.o
 obj-$(CONFIG_SBC82xx)          += todc_time.o
 obj-$(CONFIG_SPRUCE)           += cpc700_pic.o pci_auto.o \
                                   todc_time.o
+obj-$(CONFIG_TAISHAN)          += pci_auto.o
 obj-$(CONFIG_8260)             += m8260_setup.o pq2_devices.o pq2_sys.o \
                                   ppc_sys.o
 obj-$(CONFIG_PCI_8260)         += m82xx_pci.o pci_auto.o