Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2006-01-11 17:06:31 -08:00 · 2006-01-11 17:06:31 -08:00 · 99535ac2d4
--- 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