diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 20:06:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 20:06:31 -0500 |
| commit | 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (patch) | |
| tree | 6588fe50e22a2c4afe23b66b45b8e8374abe4e20 | |
| parent | 607f4e3864a4306be0d0ad11ff34284c239aad1b (diff) | |
| parent | 61943c5015acae42fe355bf033bbee8d63691fe3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -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 b775ceb4cf98..ab733be9af08 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -179,7 +179,7 @@ config HUGETLB_PAGE_SIZE_512K | |||
| 179 | bool "512K" | 179 | bool "512K" |
| 180 | 180 | ||
| 181 | config HUGETLB_PAGE_SIZE_64K | 181 | config HUGETLB_PAGE_SIZE_64K |
| 182 | depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K | 182 | depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB |
| 183 | bool "64K" | 183 | bool "64K" |
| 184 | 184 | ||
| 185 | endchoice | 185 | endchoice |