Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a196e788 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c63fdeee f2a15852

arch/sparc64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ config HUGETLB_PAGE_SIZE_512K 
	bool "512K"



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"



endchoice