From 02c296e4b02f25c9add3410d96ceeed88e3652d2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 4 Mar 2013 04:17:21 +0000
Subject: [PATCH] --- yaml --- r: 362127 b: refs/heads/master c:
 383c97b4587665d47d08dff37ec85b44be760505 h: refs/heads/master i:   362125:
 b025c34c3a7f8ee273f8e202c8b7cfc3f6c5bcff   362123:
 bf4ba94730f93ae0e6c8d562264687735cfc8a02   362119:
 434a9369501c335b46717c9ede708b48fcabbc1c   362111:
 a1d7791b5511f7db00ef25d65aedfceb4e73e288 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/mips/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 80e6e401b340..61e07ade9782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f91e5064c6c24d6ccd760a6b6120de4560d9829
+refs/heads/master: 383c97b4587665d47d08dff37ec85b44be760505
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index ae9c716c46bb..e8e10b794b87 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -18,7 +18,7 @@ config MIPS
 	select HAVE_KRETPROBES
 	select HAVE_DEBUG_KMEMLEAK
 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
-	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 	select RTC_LIB if !MACH_LOONGSON
 	select GENERIC_ATOMIC64 if !64BIT
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE