diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:02:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:02:55 -0400 |
| commit | a196e7880905313773be97dbca5aa7b0a0aed71c (patch) | |
| tree | fcea9657fcdca01b6fc3fac27c2e804aaac73c63 | |
| parent | c63fdeee94f87aafc131e5594ab030638044cc29 (diff) | |
| parent | f2a1585244681b92fd416d071a85de0db79235d2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K
| -rw-r--r-- | arch/sparc64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 648047a0bce3..43a66f5407f4 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -187,7 +187,7 @@ config HUGETLB_PAGE_SIZE_512K | |||
| 187 | bool "512K" | 187 | bool "512K" |
| 188 | 188 | ||
| 189 | config HUGETLB_PAGE_SIZE_64K | 189 | config HUGETLB_PAGE_SIZE_64K |
| 190 | depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64K | 190 | depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB |
| 191 | bool "64K" | 191 | bool "64K" |
| 192 | 192 | ||
| 193 | endchoice | 193 | endchoice |