diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 13:55:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 13:56:02 -0400 |
| commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
| tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /arch/arm/mm | |
| parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
| parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) | |
Merge branch 'pxa' 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 12161ae445da..7868f4dc1d00 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -322,7 +322,7 @@ config CPU_SA1100 | |||
| 322 | # XScale | 322 | # XScale |
| 323 | config CPU_XSCALE | 323 | config CPU_XSCALE |
| 324 | bool | 324 | bool |
| 325 | depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_PXA || ARCH_IXP4XX || ARCH_IXP2000 | 325 | depends on ARCH_IOP32X || ARCH_IOP33X || PXA25x || PXA27x || ARCH_IXP4XX || ARCH_IXP2000 |
| 326 | default y | 326 | default y |
| 327 | select CPU_32v5 | 327 | select CPU_32v5 |
| 328 | select CPU_ABRT_EV5T | 328 | select CPU_ABRT_EV5T |
| @@ -333,7 +333,7 @@ config CPU_XSCALE | |||
| 333 | # XScale Core Version 3 | 333 | # XScale Core Version 3 |
| 334 | config CPU_XSC3 | 334 | config CPU_XSC3 |
| 335 | bool | 335 | bool |
| 336 | depends on ARCH_IXP23XX || ARCH_IOP13XX | 336 | depends on ARCH_IXP23XX || ARCH_IOP13XX || PXA3xx |
| 337 | default y | 337 | default y |
| 338 | select CPU_32v5 | 338 | select CPU_32v5 |
| 339 | select CPU_ABRT_EV5T | 339 | select CPU_ABRT_EV5T |