Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux...

[linux-drm-fsl-dcu.git] / arch / x86 / um / Kconfig

diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 14ef8d1dbc33bf954b062b525ed0771ef4489172..ed56a1c4ae734d8fa2b3cb2ccd4133c2ebc4c5a8 100644 (file)
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -31,6 +31,11 @@ config X86_64
        def_bool 64BIT
        select MODULES_USE_ELF_RELA
 
+config ARCH_DEFCONFIG
+       string
+       default "arch/um/configs/i386_defconfig" if X86_32
+       default "arch/um/configs/x86_64_defconfig" if X86_64
+
 config RWSEM_XCHGADD_ALGORITHM
        def_bool 64BIT