Bernhard C. Schrenk:

package/base/linux/linux.conf

@@ -145,7 +145,7 @@ auto_config ()
 	cp .config .config.3
 
 	# merge various text/plain config files
-	for x in $base/config/$config.$swpid/linux.cfg \
+	for x in $base/config/$config/linux.cfg \
 		 $base/target/$target/kernel.conf ; do
 	   if [ -f $x ] ; then
 		echo "  merging: '$x'"