From d83c333b2d631390a817aac1c92fc73117cde681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Wed, 22 Jan 2025 12:25:08 +0100
Subject: [PATCH] generate-defconfig: Fix typo in script

Should not call merge_config.sh with -n parameter, this will result
in an invalid defconfig.
---
 utils/generate-defconfig.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/generate-defconfig.sh b/utils/generate-defconfig.sh
index 76f7af59..b4ff2bb5 100755
--- a/utils/generate-defconfig.sh
+++ b/utils/generate-defconfig.sh
@@ -74,7 +74,7 @@ check_file "$base" "Base config"
 check_file "$changes" "Changes config"
 
 TMPDIR=`mktemp -d`
-$MERGE_CONFIG -O "$TMPDIR" -n "$base" "$changes"
+$MERGE_CONFIG -O "$TMPDIR" "$base" "$changes"
 O="$TMPDIR" make savedefconfig
 mv "$TMPDIR"/defconfig "$output"
 rm -r "$TMPDIR"