Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

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

diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index f60e9e506424cf91e6b97ff61105a7dfc4b4788d..3fbe69e359edcd6ddcc7b18e701c7a04071741fa 100644 (file)
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -11,30 +11,10 @@ config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
-config SEMAPHORE_SLEEPERS
-       bool
-       default y
-
-config TOP_ADDR
-       hex
-       default 0x80000000
-
 config 3_LEVEL_PGTABLES
        bool
        default y
 
-config STUB_CODE
-       hex
-       default 0x7fbfffe000
-
-config STUB_DATA
-       hex
-       default 0x7fbffff000
-
-config STUB_START
-       hex
-       default STUB_CODE
-
 config ARCH_HAS_SC_SIGNALS
        bool
        default n
@@ -51,3 +31,5 @@ config GENERIC_HWEIGHT
        bool
        default y
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y