diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 13:52:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 13:52:44 -0400 |
| commit | 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (patch) | |
| tree | f3f593fa2d1e01c2a6a4d9da9786ad1e12dfc2a0 /arch/arm/Kconfig | |
| parent | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (diff) | |
| parent | a10aabd5e313ec6481569be20d120191692b4ca6 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
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 93d595a7477a..4f8f3a4e4e0d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -365,6 +365,7 @@ config ARCH_MXC | |||
| 365 | select GENERIC_CLOCKEVENTS | 365 | select GENERIC_CLOCKEVENTS |
| 366 | select ARCH_REQUIRE_GPIOLIB | 366 | select ARCH_REQUIRE_GPIOLIB |
| 367 | select CLKDEV_LOOKUP | 367 | select CLKDEV_LOOKUP |
| 368 | select HAVE_SCHED_CLOCK | ||
| 368 | help | 369 | help |
| 369 | Support for Freescale MXC/iMX-based family of processors | 370 | Support for Freescale MXC/iMX-based family of processors |
| 370 | 371 | ||