diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/arm/mm | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index d1193884d76d..ab5f7a21350b 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -400,9 +400,9 @@ config CPU_FEROCEON_OLD_ID | |||
| 400 | # ARMv6 | 400 | # ARMv6 |
| 401 | config CPU_V6 | 401 | config CPU_V6 |
| 402 | bool "Support ARM V6 processor" | 402 | bool "Support ARM V6 processor" |
| 403 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 | 403 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 |
| 404 | default y if ARCH_MX3 | 404 | default y if ARCH_MX3 |
| 405 | default y if ARCH_MSM7X00A | 405 | default y if ARCH_MSM |
| 406 | select CPU_32v6 | 406 | select CPU_32v6 |
| 407 | select CPU_ABRT_EV6 | 407 | select CPU_ABRT_EV6 |
| 408 | select CPU_PABRT_NOIFAR | 408 | select CPU_PABRT_NOIFAR |