summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 17:06:31 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 17:06:31 -0800
commit99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (patch)
tree6588fe50e22a2c4afe23b66b45b8e8374abe4e20 /arch
parent607f4e3864a4306be0d0ad11ff34284c239aad1b (diff)
parent61943c5015acae42fe355bf033bbee8d63691fe3 (diff)
downloadop-kernel-dev-99535ac2d4d95dbcad6b8d8a04ea57a891fb533b.zip
op-kernel-dev-99535ac2d4d95dbcad6b8d8a04ea57a891fb533b.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b775ceb..ab733be 100644
--- 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_512KB
bool "64K"
endchoice
OpenPOWER on IntegriCloud