diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /arch/arm/Kconfig | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b92925c70172..3d9397ec746d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -401,7 +401,11 @@ config ARCH_MV78XX0 | |||
| 401 | 401 | ||
| 402 | config ARCH_MXC | 402 | config ARCH_MXC |
| 403 | bool "Freescale MXC/iMX-based" | 403 | bool "Freescale MXC/iMX-based" |
| 404 | select GENERIC_TIME | ||
| 405 | select GENERIC_CLOCKEVENTS | ||
| 404 | select ARCH_MTD_XIP | 406 | select ARCH_MTD_XIP |
| 407 | select GENERIC_GPIO | ||
| 408 | select HAVE_GPIO_LIB | ||
| 405 | help | 409 | help |
| 406 | Support for Freescale MXC/iMX-based family of processors | 410 | Support for Freescale MXC/iMX-based family of processors |
| 407 | 411 | ||