Pull misc into release branch

[linux-2.6] / arch / um / defconfig

diff --git a/arch/um/defconfig b/arch/um/defconfig
index a25cd25d55d44d67335527a947655ec89037e460..1e0f677c2f4685e8eabd652c9ff3d60f76dbf28e 100644 (file)
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -52,7 +52,6 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y