From 2c6e55f4f362476c046a9bebe1ca74a26074908d Mon Sep 17 00:00:00 2001
From: mahi <devnull@localhost>
Date: Sun, 29 Apr 2012 15:09:58 +0200
Subject: [PATCH] Bad merge fixed from
 1618:6a28ae7576acbab8bb569e06907f01ea63232d4c

---
 boards/board_common.mk | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.39.2