diff --git a/[refs] b/[refs]
index f8573f000a0d..6362f236f4c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06aa05b307e8efbc278f201198e7cdf3877bc5c2
+refs/heads/master: 54c28d294c658abb6d6430a49fda230fdfd601c8
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 748e50a1a152..2817ab5a1204 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -354,6 +354,7 @@ config X86_UV
 	bool "SGI Ultraviolet"
 	depends on X86_64
 	depends on X86_EXTENDED_PLATFORM
+	depends on NUMA
 	select X86_X2APIC
 	---help---
 	  This option is needed in order to support SGI Ultraviolet systems.