diff --git a/[refs] b/[refs]
index 4fdfc4ac15a4..3252a61db391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca42b26ab285edc5ee3f9faa48379d258db53c35
+refs/heads/master: 15626062f4a98279c59a2a5208c496cf65cbf8c0
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index a62965d057f6..550cce4dd648 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -313,4 +313,7 @@ config HAVE_IRQ_TIME_ACCOUNTING
 	  Archs need to ensure they use a high enough resolution clock to
 	  support irq time accounting and then call enable_sched_clock_irqtime().
 
+config HAVE_ARCH_TRANSPARENT_HUGEPAGE
+	bool
+
 source "kernel/gcov/Kconfig"
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 6119d6c7002e..1ae94bcae5d9 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -88,6 +88,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select USE_GENERIC_SMP_HELPERS if SMP
 	select HAVE_BPF_JIT if X86_64
+	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
 	select CLKEVT_I8253
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 	select GENERIC_IOMAP
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index d5c8019c6627..3322342a1ffb 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -318,7 +318,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
 
 config TRANSPARENT_HUGEPAGE
 	bool "Transparent Hugepage Support"
-	depends on X86 && MMU
+	depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
 	select COMPACTION
 	help
 	  Transparent Hugepages allows the kernel to use huge pages and