git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
607f4e3
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 12 Jan 2006 01:06:31 +0000
(17:06 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 12 Jan 2006 01:06:31 +0000
(17:06 -0800)
arch/sparc64/Kconfig
patch
|
blob
|
history
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index
b775ceb
..
ab733be
100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-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