From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 12 May 2012 05:32:09 +0000 (+0800)
Subject: Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=844d0b5a0b42d6c73114a1dc229db751120d226f;p=linux-beck.git

Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
---

844d0b5a0b42d6c73114a1dc229db751120d226f
diff --cc arch/arm/Kconfig
index 2095a513a7c0,c67494fc05a7..ae5c251cd251
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -468,8 -468,8 +468,9 @@@ config ARCH_MX
  	select ARCH_REQUIRE_GPIOLIB
  	select CLKDEV_LOOKUP
  	select CLKSRC_MMIO
 +	select COMMON_CLK
  	select HAVE_CLK_PREPARE
+ 	select PINCTRL
  	help
  	  Support for Freescale MXS-based family of processors