diff options
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c0bfb8212b77..aade2f72c920 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -197,7 +197,7 @@ config CPU_ARM940T | |||
197 | select CPU_CP15_MPU | 197 | select CPU_CP15_MPU |
198 | help | 198 | help |
199 | ARM940T is a member of the ARM9TDMI family of general- | 199 | ARM940T is a member of the ARM9TDMI family of general- |
200 | purpose microprocessors with MPU and seperate 4KB | 200 | purpose microprocessors with MPU and separate 4KB |
201 | instruction and 4KB data cases, each with a 4-word line | 201 | instruction and 4KB data cases, each with a 4-word line |
202 | length. | 202 | length. |
203 | 203 | ||
@@ -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 | 336 | depends on ARCH_IXP23XX || ARCH_IOP13XX |
337 | default y | 337 | default y |
338 | select CPU_32v5 | 338 | select CPU_32v5 |
339 | select CPU_ABRT_EV5T | 339 | select CPU_ABRT_EV5T |
@@ -580,7 +580,7 @@ config CPU_CACHE_ROUND_ROBIN | |||
580 | 580 | ||
581 | config CPU_BPREDICT_DISABLE | 581 | config CPU_BPREDICT_DISABLE |
582 | bool "Disable branch prediction" | 582 | bool "Disable branch prediction" |
583 | depends on CPU_ARM1020 || CPU_V6 | 583 | depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 |
584 | help | 584 | help |
585 | Say Y here to disable branch prediction. If unsure, say N. | 585 | Say Y here to disable branch prediction. If unsure, say N. |
586 | 586 | ||