From: mahi <devnull@localhost>
Date: Sun, 29 Apr 2012 13:09:58 +0000 (+0200)
Subject: Bad merge fixed from 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/2c6e55f4f362476c046a9bebe1ca74a26074908d

Bad merge fixed from 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c
---

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 7b77313a..042cb878 100644
--- 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
 obj-$(USE_CAN)-$(CFG_PPC) += Can_PBcfg.o
 obj-$(USE_CAN)-$(CFG_ARM_CM3) += Can_Lcfg.o
+obj-$(USE_CAN)-$(CFG_ARM_CR4) += Can_Lcfg.o
 obj-$(USE_CAN)-$(CFG_HC1X) += Can_Lcfg.o
 
 # CanIf