summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-05-25 23:03:18 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-06-16 13:20:05 -0700
commitc7559a1531958785bdc25363f8cde154011c0f9d (patch)
tree99549ade5c90864c96d2c1f9efcda1cc8d166709 /init
parent3f8c9c7e37568163e4a9d923286b8ca30a42bed6 (diff)
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
commit 73531905ed53576d9e8707659a761e7046a60497 in mainline. init/Kconfig contains a list of configs that are searched for if 'make *config' are used with no .config present. Extend this list to look at the config identified by ARCH_DEFCONFIG. With this change we now try the defconfig targets last. This fixes a regression reported by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index a97924bc5b8d..021476fced06 100644
--- a/init/Kconfig
+++ b/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"