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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K
This commit is contained in:
Linus Torvalds 2006-04-18 18:02:55 -07:00
commit a196e78809

View File

@ -187,7 +187,7 @@ config HUGETLB_PAGE_SIZE_512K
bool "512K" bool "512K"
config HUGETLB_PAGE_SIZE_64K config HUGETLB_PAGE_SIZE_64K
depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64K depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB
bool "64K" bool "64K"
endchoice endchoice