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

99535ac2 · Linus Torvalds · 607f4e38 · 61943c50 · 99535ac2
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

arch/sparc64/Kconfig arch/sparc64/Kconfig +1 -1

未找到文件。
--- 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