From 51a2e37ad09510ad71fd2e4525199ed5a2d984b4 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 25 May 2008 23:03:18 +0200 Subject: [PATCH] --- yaml --- r: 97321 b: refs/heads/master c: 73531905ed53576d9e8707659a761e7046a60497 h: refs/heads/master i: 97319: 0031b4a9aaa6432ecf35ad7acf25273f9da2bca6 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 13 +++---------- trunk/init/Kconfig | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 658568c2863d..cdf9da0804b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9723c046bd5989aa9064038ce142f498bb1870d6 +refs/heads/master: 73531905ed53576d9e8707659a761e7046a60497 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index fe361ae7ef2f..dcbec34154cf 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -26,17 +26,10 @@ 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 +config ARCH_DEFCONFIG 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" + default "arch/x86/configs/i386_defconfig" if X86_32 + default "arch/x86/configs/x86_64_defconfig" if X86_64 config GENERIC_LOCKBREAK diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 6135d07f31ec..6199d1120900 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -13,6 +13,7 @@ config DEFCONFIG_LIST default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config" default "/boot/config-$UNAME_RELEASE" + default "$ARCH_DEFCONFIG" default "arch/$ARCH/defconfig" menu "General setup"