diff --git a/[refs] b/[refs] index 9dfadfb350e2..1151f66ec9eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dcf83fd0c42525dd36cfeb61fe0bfb12113c6b3 +refs/heads/master: b9b39bfba5b0de3418305f01cfa7bc55a16004e1 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 80303187b872..c3f880902d66 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -25,6 +25,18 @@ config X86 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER +config DEFCONFIG_LIST + string + depends on X86_32 + option defconfig_list + default "arch/x86/configs/i386_defconfig" + +config DEFCONFIG_LIST + string + depends on X86_64 + option defconfig_list + default "arch/x86/configs/x86_64_defconfig" + config GENERIC_LOCKBREAK def_bool n