Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / um / Kconfig.x86_64

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index b438f0e14271b85f075e3c55e023bb63e05b3956..6533b349f06190eb31ea7960ad9e65fbc36475b8 100644 (file)
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -15,10 +15,6 @@ config SEMAPHORE_SLEEPERS
        bool
        default y
 
-config TOP_ADDR
-       hex
-       default 0x7fc0000000
-
 config 3_LEVEL_PGTABLES
        bool
        default y