Make "oldconfig" look for old defaults first in .config, then

in /etc/kernel-config, and only if that fails in the architecture-
specific defconfig.

diff --git a/scripts/Configure b/scripts/Configure
index 9d9574f12b215b01050d1df7971d08bc0246675a..12f7fbcae1637e5a47de9d94204b8ab50a04fb52 100644 (file)
--- a/scripts/Configure
+++ b/scripts/Configure
@@ -537,9 +537,12 @@ if [ "$1" != "" ] ; then
        CONFIG_IN=$1
 fi
 
-DEFAULTS=arch/$ARCH/defconfig
-if [ -f .config ]; then
-  DEFAULTS=.config
+DEFAULTS=.config
+if [ ! -f .config ]; then
+  DEFAULTS=/etc/kernel-config
+  if [ ! -f $DEFAULTS ]; then
+    DEFAULTS=arch/$ARCH/defconfig
+  fi
 fi
 
 if [ -f $DEFAULTS ]; then