diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /arch/arm/mm/Kconfig | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 007766a0644c..27892e34b060 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -413,6 +413,7 @@ config CPU_BPREDICT_DISABLE | |||
| 413 | config HAS_TLS_REG | 413 | config HAS_TLS_REG |
| 414 | bool | 414 | bool |
| 415 | depends on CPU_32v6 && !CPU_32v5 && !CPU_32v4 && !CPU_32v3 | 415 | depends on CPU_32v6 && !CPU_32v5 && !CPU_32v4 && !CPU_32v3 |
| 416 | default y | ||
| 416 | help | 417 | help |
| 417 | This selects support for the CP15 thread register. | 418 | This selects support for the CP15 thread register. |
| 418 | It is defined to be available on ARMv6 or later. However | 419 | It is defined to be available on ARMv6 or later. However |