summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-05 12:27:46 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-05 12:27:46 +0900
commita7595fe7e8a93a73ce6199dace75a0caca7024c1 (patch)
treed8ed3959fe722ac5dad69285dea5537fc2535098 /arch/sh/mm/Kconfig
parent921a220857cdd3c553cde7c114f9f6757ac80cd5 (diff)
parent2a5eacca85d39d8b6dffae821d7d260f05584dc7 (diff)
downloadlinux-a7595fe7e8a93a73ce6199dace75a0caca7024c1.tar.bz2
Merge branch 'sh/pgtable' of git://github.com/mfleming/linux-2.6
Diffstat (limited to 'arch/sh/mm/Kconfig')
-rw-r--r--arch/sh/mm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index a5dedf590a78..358c860aeb9b 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -219,7 +219,7 @@ config PAGE_SIZE_4KB
config PAGE_SIZE_8KB
bool "8kB"
- depends on !MMU || X2TLB && !PGTABLE_LEVELS_3
+ depends on !MMU || X2TLB
help
This enables 8kB pages as supported by SH-X2 and later MMUs.
@@ -231,7 +231,7 @@ config PAGE_SIZE_16KB
config PAGE_SIZE_64KB
bool "64kB"
- depends on !MMU || CPU_SH4 && !PGTABLE_LEVELS_3 || CPU_SH5
+ depends on !MMU || CPU_SH4 || CPU_SH5
help
This enables support for 64kB pages, possible on all SH-4
CPUs and later.