diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 07:12:42 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 07:12:42 -0500 |
| commit | 0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 (patch) | |
| tree | c2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7 /arch/arm/Kconfig | |
| parent | 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde (diff) | |
| parent | b9214b9780d6897a6892e7c8cc903168d6fef097 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 99829a2bee92..5711c8160e75 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -363,7 +363,7 @@ config ARCH_MXS | |||
| 363 | bool "Freescale MXS-based" | 363 | bool "Freescale MXS-based" |
| 364 | select GENERIC_CLOCKEVENTS | 364 | select GENERIC_CLOCKEVENTS |
| 365 | select ARCH_REQUIRE_GPIOLIB | 365 | select ARCH_REQUIRE_GPIOLIB |
| 366 | select COMMON_CLKDEV | 366 | select CLKDEV_LOOKUP |
| 367 | help | 367 | help |
| 368 | Support for Freescale MXS-based family of processors | 368 | Support for Freescale MXS-based family of processors |
| 369 | 369 | ||