diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 16:06:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 16:06:11 +0100 |
| commit | 64357ed468025614d48daa6cc87674ae5616f8fb (patch) | |
| tree | 2467c239364d7602755b73203025d329c6f84b22 /arch/sh/mm/Kconfig | |
| parent | be404f0212ffa8f67361f8ee460a25d901d88991 (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/sh/mm/Kconfig')
| -rw-r--r-- | arch/sh/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 64dc1ad5980..7f7b52f9beb 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -227,7 +227,7 @@ endchoice choice prompt "HugeTLB page size" - depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU + depends on HUGETLB_PAGE default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB default HUGETLB_PAGE_SIZE_64K |