diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
commit | 92c427b18982167064de454ae5248ec466998919 (patch) | |
tree | a60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01 /board/cds/mpc8541cds/Makefile | |
parent | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (diff) | |
parent | 34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb (diff) |
Merge branch 'mpc85xx'
Conflicts:
include/ft_build.h
include/pci.h
Resolved, though.
Diffstat (limited to 'board/cds/mpc8541cds/Makefile')
-rw-r--r-- | board/cds/mpc8541cds/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/cds/mpc8541cds/Makefile b/board/cds/mpc8541cds/Makefile index 0d4abbd71d..d202281d45 100644 --- a/board/cds/mpc8541cds/Makefile +++ b/board/cds/mpc8541cds/Makefile @@ -28,7 +28,9 @@ LIB = lib$(BOARD).a OBJS := $(BOARD).o \ ../common/cadmus.o \ - ../common/eeprom.o + ../common/eeprom.o \ + ../common/ft_board.o \ + ../common/via.o SOBJS := init.o |