diff --git a/[refs] b/[refs]
index 4241eb099404..5809a0a880ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5091e746848f74c9a2c0579b4ef8d8cd1a6b135d
+refs/heads/master: 753b9f86e7aef76c2beda32668ce528f90cb1733
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index 1f83efb7a60e..6189b0c28d6f 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -494,7 +494,7 @@ config HIGHMEM64G
 endchoice
 
 choice
-	depends on EXPERIMENTAL && !X86_PAE
+	depends on EXPERIMENTAL
 	prompt "Memory split" if EMBEDDED
 	default VMSPLIT_3G
 	help
@@ -516,6 +516,7 @@ choice
 	config VMSPLIT_3G
 		bool "3G/1G user/kernel split"
 	config VMSPLIT_3G_OPT
+		depends on !HIGHMEM
 		bool "3G/1G user/kernel split (for full 1G low memory)"
 	config VMSPLIT_2G
 		bool "2G/2G user/kernel split"