Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
This commit is contained in:
commit
99535ac2d4
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue