diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 17:06:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 17:06:31 -0800 |
| commit | 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (patch) | |
| tree | 6588fe50e22a2c4afe23b66b45b8e8374abe4e20 /arch | |
| parent | [PATCH] new tty buffering access fix (diff) | |
| parent | [SPARC64] arch/sparc64/Kconfig: fix HUGETLB_PAGE_SIZE_64K dependencies (diff) | |
| download | linux-dev-99535ac2d4d95dbcad6b8d8a04ea57a891fb533b.tar.xz linux-dev-99535ac2d4d95dbcad6b8d8a04ea57a891fb533b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch')
| -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 bool "512K" config HUGETLB_PAGE_SIZE_64K - depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K + depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB bool "64K" endchoice |