git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
[sfrench/cifs-2.6.git]
/
arch
/
sparc64
/
Kconfig
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index 648047a0bce34ed91d7eace9f05b9d4dfedb9e5b..43a66f5407f45b2b5d04666f0f765f2cd287778b 100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-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_64K
B
bool "64K"
endchoice