X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2FKconfig;h=f87000a1db2726eb2176b87d8eea337eb824721a;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=298c0185b982950db7efb00c94b09bddae227590;hpb=e3f6fb6212a7102bdb56ba38fa1e98fe72950475;p=linux-2.6.git

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 298c0185b..f87000a1d 100644
--- 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"