From 49b26aca974b3743cd55620bfa5fd49e08a9eef5 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 2 Jul 2012 11:03:01 +0200 Subject: [PATCH] --- yaml --- r: 313230 b: refs/heads/master c: e1d4f23ec0688f58b7d60265f38e1cbe8c3a4432 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c4d8a72e1e11..d8df47f03b5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f34ffc9efc9f916c2594c6e86e813acacbd7572f +refs/heads/master: e1d4f23ec0688f58b7d60265f38e1cbe8c3a4432 diff --git a/trunk/arch/arm/mach-mxs/Kconfig b/trunk/arch/arm/mach-mxs/Kconfig index 91cf0625819c..ccdf83b17cf1 100644 --- a/trunk/arch/arm/mach-mxs/Kconfig +++ b/trunk/arch/arm/mach-mxs/Kconfig @@ -16,6 +16,7 @@ config SOC_IMX28 bool select ARM_AMBA select CPU_ARM926T + select HAVE_CAN_FLEXCAN if CAN select HAVE_PWM select PINCTRL_IMX28