Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[karo-tx-linux.git] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 9b6cddc8c51bea5a331ae2f505a0734a4dcb32d1..758044f5e718deba9da1db551c111219f3af5c1c 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -493,7 +493,7 @@ config HIGHMEM64G
 endchoice
 
 choice
-       depends on EXPERIMENTAL && !X86_PAE
+       depends on EXPERIMENTAL
        prompt "Memory split" if EMBEDDED
        default VMSPLIT_3G
        help
@@ -515,6 +515,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"
@@ -799,6 +800,7 @@ config HOTPLUG_CPU
 config COMPAT_VDSO
        bool "Compat VDSO support"
        default y
+       depends on !PARAVIRT
        help
          Map the VDSO to the predictable old-style address too.
        ---help---