Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / board / xes / common / Makefile

diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile
index c5cd6331ef77c8fb525d53a472ec44015db7eefc..e7620f447f65c9754ddeb137ae312fc00bca90a0 100644 (file)
--- a/board/xes/common/Makefile
+++ b/board/xes/common/Makefile
@@ -29,9 +29,10 @@ endif
 
 LIB    = $(obj)lib$(VENDOR).a
 
+COBJS-$(CONFIG_FSL_PCI_INIT)   += fsl_85xx_pci.o
 COBJS-$(CONFIG_MPC8572)                += fsl_8572_clk.o
 COBJS-$(CONFIG_MPC85xx)                += fsl_85xx_ddr.o
-COBJS-$(CONFIG_FSL_PCI_INIT)   += fsl_85xx_pci.o
+COBJS-$(CONFIG_NAND_ACTL)      += actl_nand.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS-y))