diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 01:32:09 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 01:32:09 -0400 |
| commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
| tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /arch/arm/Kconfig | |
| parent | 50260924afd4b745bfb6e5f1caee381a1875fc31 (diff) | |
| parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) | |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2095a513a7c..ae5c251cd25 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -470,6 +470,7 @@ config ARCH_MXS | |||
| 470 | select CLKSRC_MMIO | 470 | select CLKSRC_MMIO |
| 471 | select COMMON_CLK | 471 | select COMMON_CLK |
| 472 | select HAVE_CLK_PREPARE | 472 | select HAVE_CLK_PREPARE |
| 473 | select PINCTRL | ||
| 473 | help | 474 | help |
| 474 | Support for Freescale MXS-based family of processors | 475 | Support for Freescale MXS-based family of processors |
| 475 | 476 | ||