diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 18:52:44 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 18:52:44 +0100 |
commit | 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (patch) | |
tree | f3f593fa2d1e01c2a6a4d9da9786ad1e12dfc2a0 /arch/arm/mach-mx5/Kconfig | |
parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable (diff) | |
parent | arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 (diff) | |
download | linux-dev-5f183860d5007ec76ea36bfa6c36d66e37f0dbcf.tar.xz linux-dev-5f183860d5007ec76ea36bfa6c36d66e37f0dbcf.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/Kconfig')
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 83ee08847d4d..159340da9191 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -165,6 +165,7 @@ config MACH_MX53_LOCO select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX + select IMX_HAVE_PLATFORM_GPIO_KEYS help Include support for MX53 LOCO platform. This includes specific configurations for the board and its peripherals. |