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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b775ceb..ab733be 100644 (file)
--- 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