vserver 2.0 rc7

[linux-2.6.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 298c018..f87000a 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -3,7 +3,7 @@ config GENERIC_HARDIRQS
        bool
        default y
 
-config USERMODE
+config UML
        bool
        default y
 
@@ -244,7 +244,7 @@ config KERNEL_HALF_GIGS
 
 config HIGHMEM
        bool "Highmem support"
-       depends on BROKEN
+       depends on !64BIT
 
 config KERNEL_STACK_ORDER
        int "Kernel stack size order"