Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Jan 12, 2006
2 parents 607f4e3 + 61943c5 commit 99535ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/sparc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 99535ac

Please sign in to comment.