Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
This commit is contained in:
Коммит
99535ac2d4
|
@ -179,7 +179,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_512K
|
depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
|
||||||
bool "64K"
|
bool "64K"
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
Загрузка…
Ссылка в новой задаче