From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 30 Mar 2015 08:49:19 +0000 (+0800)
Subject: Merge branch 'imx/soc' into for-next
X-Git-Tag: KARO-TXA5-2015-06-26~147^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=14dd4dd68e9241c0b4f2c60db8ea85ecd59e4d37;p=karo-tx-linux.git

Merge branch 'imx/soc' into for-next
---

14dd4dd68e9241c0b4f2c60db8ea85ecd59e4d37
diff --cc arch/arm/mach-imx/Kconfig
index ddbb4b837fea,bf42a6a86bed..93aa90413c12
--- 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"