From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 30 Mar 2015 08:37:04 +0000 (+0800)
Subject: Merge branch 'imx/soc' into imx/dt
X-Git-Tag: v4.1-rc1~45^2~2^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40cb1981b387f70ae750da57c2310539f4b813c7;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'imx/soc' into imx/dt
---

40cb1981b387f70ae750da57c2310539f4b813c7
diff --cc arch/arm/mach-imx/Kconfig
index ddbb4b8,bf42a6a..93aa904
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -585,9 -636,10 +587,10 @@@ config SOC_VF61
  	select ARM_GIC
  	select PINCTRL_VF610
  	select PL310_ERRATA_769419 if CACHE_L2X0
+ 	select SMP_ON_UP if SMP
  
  	help
 -	  This enable support for Freescale Vybrid VF610 processor.
 +	  This enables support for Freescale Vybrid VF610 processor.
  
  choice
  	prompt "Clocksource for scheduler clock"