diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 07:32:09 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 07:32:09 +0200 |
| commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
| tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /arch/arm/mach-mxs/Kconfig | |
| parent | ARM: mxs: remove now unused timer_clk argument from mxs_timer_init (diff) | |
| parent | ARM: mxs: enable pinctrl support (diff) | |
| download | linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.xz linux-844d0b5a0b42d6c73114a1dc229db751120d226f.zip | |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'arch/arm/mach-mxs/Kconfig')
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index c57f9964a713..07d5383d68ee 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -9,11 +9,13 @@ config SOC_IMX23 bool select CPU_ARM926T select HAVE_PWM + select PINCTRL_IMX23 config SOC_IMX28 bool select CPU_ARM926T select HAVE_PWM + select PINCTRL_IMX28 comment "MXS platforms:" |