Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
odroid-linux-3.10.y-rt
Commits
99535ac2
Commit
99535ac2
authored
Jan 11, 2006
by
Linus Torvalds
Browse files
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
parents
607f4e38
61943c50
Changes
1
Hide whitespace changes
Inline
Side-by-side
arch/sparc64/Kconfig
View file @
99535ac2
...
...
@@ -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_512K
B
bool "64K"
endchoice
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment