Bad merge fixed from 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 7b77313ab050abc842262b24455aa7aee0552e63..042cb878072d4a1d1ae125c940aae95cd2e1b3bb 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -74,6 +74,7 @@ inc-$(CFG_MPC55XX) +=  $(ROOTDIR)/$(ARCH_PATH-y)/delivery/mpc5500_h7f/include
 obj-$(USE_CAN) += Can.o\r
 obj-$(USE_CAN)-$(CFG_PPC) += Can_PBcfg.o\r
 obj-$(USE_CAN)-$(CFG_ARM_CM3) += Can_Lcfg.o\r
+obj-$(USE_CAN)-$(CFG_ARM_CR4) += Can_Lcfg.o\r
 obj-$(USE_CAN)-$(CFG_HC1X) += Can_Lcfg.o\r
 \r
 # CanIf\r